here some tests
fixed merge conflict