add 2_28 after the long trip @shandong province
fix conflict