Merging our changes into a repo