Merge local and remote changes.