fix merge conflict

add a new acceptance test case