Add support for merge file options