creating merge conflict
resolved conflict