Testsuite: changes in output lost in merge