# Conflicts: # osu.Game/Graphics/UserInterface/BackButton.cs # osu.Game/Screens/Play/Player.cs # osu.Game/osu.Game.csproj
Also fixes the broken IPC condition
# Conflicts: # osu.Desktop.VisualTests/osu.Desktop.VisualTests.csproj
Conflicts: osu.Game/Online/Chat/Message.cs
Comes with one complimentary test.