Updated readme
Fix conflict