Is it possible to merge changes from a clone/branch back to the "official copy"?