merging changes back to the repo