Fix failing test
Fix merge conflict