learn merge conflicts