merging existing edits
fixing merges on desktop