Merge local modifs.