removed a unresolved conflict in README.mde