publish - merge -s recursive -X theirs