working on readme and fixing a merge