Git Merge Remote Branch With Local