removed conflict info from readme file