Add merge strategy option support