Fixed misleading text about conflict resolution on READ.ME