[SyncEvolution] phone branch merging