solving merge conflict