merge with android