Git Merge Local Branch With Master