Remove vestige of merge conflicts
Remove vestige of merge conflicts

OsnaCS/dbp-game,OsnaCS/dbp-game,fizzule/dbp-game,ChristianReinhard/dbp-game,fizzule/dbp-game,OsnaCS/dbp-game,fizzule/dbp-game,ChristianReinhard/dbp-game,ChristianReinhard/dbp-game