worke on readme
fixed merge conflict