merge android+ios