Manually Merge Branch Git