tests
merge confliced solved in test