tests
fixes merge confl