added some test
fixed conflict