Merging local and remote