Merge changes into repo for edit