creating merge conflicts on purpose but unhappy about it