fix merge conflicts in game edit forms