editing readme
resolving merge conflict