updated readme file
fixed merge conflict
fixed nasty typo