readme adjusted
fixed merge conflict in Readme file