Resolve merge conflict in tests.mustache