Removed forgotten merge conflict text