Git Merge Local Repository With Remote