Fix README
Fix conflict