Git Merge Local Changes With Remote