readme version conflict resolve