fixing a conflict -> readding README