Recommit changes in editing games and saving games, fixing merge issues.