Fix logicInGame merge problem