Remove some merge conflict code accidentally left in
Merge branch 'hotfix/fixtests'