using merge -X theirs strategy