trying to fix conflicts
slightly updated README