(bug) creating merge conflict