Better README
Fixing some conflicts