Don't commit merge conflicts :/