there are some conflicts:
both modified: foudations/mogo-commons/src/main/java/com/mogo/commons/AbsMogoApplication.java
both modified: gradle.properties
both modified: modules/mogo-module-share/consumer-rules.pro
both modified: modules/mogo-module-share/src/main/java/com/mogo/module/share/strategyreceiver/BlockStrategy.kt