publish - merge theirs