Can I use option templates and csv_import_export modifications together?

Hi,

I’m having trouble getting the optional templates modification and the csv_import_export modifications to work together. If I follow your instructions, I can get either one to individually work. However, both seem to modify the same option.php file in Model. Is there a way to get both to work at once? Thanks.