language where you can search for >>>> for merge conflicts and get code