Try to fix some conflict

.apk, .ap_