add test case
fix merge bug