made some readme changes
resolved a conflict