add thirdpart and bu-tabs comments
resolve conflict