fixes
changed readme
resolved conflicts