Solving merge conflict
solving conflict