final resolve of merge conflicts

cause unity is stupid and the scene is a binary file