don't commit merge conflicts