lol merge conflicts