Fixes merge conflict present in generate.mtl.