Removed unnecessary text from git merge resolution.