clean up readme after merge conflicts