Merge changes from local copy.