Removed merge conflict info.