Updated README
Fixing conflicts