Merged remote and local versions