manual merge lol