Fixes test failure, problem around valid case involving merges