fix readme
fix conflicts
master finally ok