Got right of merge problem