creating merge conflict