updated line 4 of readme
fixed merge conflicts