clean up readme after merge conflicts 2