Merging to my local branch