Merge with android sketch