error: Your local changes to the following files would be overwritten by merge:
        BoredPixelJam/Assets/Scenes/demoScene.unity
        BoredPixelJam/ProjectSettings/EditorBuildSettings.asset
        BoredPixelJam/ProjectSettings/ProjectSettings.asset
        BoredPixelJam/ProjectSettings/UnityConnectSettings.asset
Please commit your changes or stash them before you merge.