updated readme
removed a redundant test
resolved conflict