fixes merge errors (why tests failed)