changes some test
fixed conflict