udpated readme
fixed merge conflicts