Rami readme
resolved conflict