solving merge conflict issues