ios/android merge