Removed merge conflict info from 26997