resolve merge conflicts and fix all tests