fixed tests
fixed merge conflicts