Merge of Thang and me