Merging and Updating My Fork