check for merge conflicts