this is my first commit
fixed an merge issue with the README file