updated with local working copy
merged changes from local working directory