merging local changes