Add rubbishForTesting() to demo pull request with conflict