Merge sipdroid