Conflict test changed readme completely