merge SelfTaxi