Merge conflict was resolved badly.