Fix merge conflict
Ooops, we probably need those tests
fix req conflict