more test cases
fixed conflict