$ git status

OHQ/OHQ/GameScreens/GameplayScreen.cs: needs merge
OHQ/OHQ/GameScreens/MapScreen.cs: needs merge
OHQ/OHQ/ScreenManager/GameScreen.cs: needs merge
OHQ/OHQ/Screens/MainMenuScreen.cs: needs merge
OHQ/OHQ/Session/Session.cs: needs merge
# On branch battle-screen
# Changes to be committed:
#   (use "git reset HEAD <file>..." to unstage)
#
#       modified:   OHQ/OHQ.4.1.resharper.user
#       modified:   OHQ/OHQ.suo
#       modified:   OHQ/OHQ/Content/Content.contentproj
#       new file:   OHQ/OHQ/Content/forestbackground.png
#       modified:   OHQ/OHQ/Content/obj/x86/Debug/ContentPipeline.xml
#       new file:   OHQ/OHQ/GameScreens/BattleScreen.cs
#       modified:   OHQ/OHQ/OHQWindows.csproj
#       modified:   OHQ/OHQ/OHQWindows.csproj.Debug.cachefile
#       new file:   OHQ/OHQ/bin/x86/Debug/Content/forestbackground.xnb
#       modified:   OHQ/OHQ/bin/x86/Debug/OHQ.exe
#       modified:   OHQ/OHQ/bin/x86/Debug/OHQ.pdb
#       modified:   OHQ/OHQ/obj/x86/Debug/OHQ.exe
#       modified:   OHQ/OHQ/obj/x86/Debug/OHQ.pdb
#       modified:   OHQ/OHQ/obj/x86/Debug/OHQWindows.csproj.FileListAbsolute.txt
#       modified:   OHQ/OHQ/obj/x86/Debug/cachefile-2b2f429e-d7d1-4a60-a8c7-f6ad
: