<DA-313> fix ios merge