Fixing the pull response for merge conflict cases.