updated README file
fixed merge conflict w/ my change