Merging new changes into my repository