correct version conflict