made changes to readme on master
fixed conflict