Merge Local Version With Git Version