upgrade to nexus v2.10.0-02
fix merge