Enable catarse moip 2.0
fix conflicts