Merging changes locally.