Fixing Readme file merge errors