Fixed merge conflict with Filter.merge(...) routine
Fixed merge conflict with Filter.merge(...) routine

liangjg/openmc,walshjon/openmc,johnnyliu27/openmc,johnnyliu27/openmc,paulromano/openmc,johnnyliu27/openmc,shikhar413/openmc,bhermanmit/openmc,smharper/openmc,liangjg/openmc,wbinventor/openmc,amandalund/openmc,samuelshaner/openmc,amandalund/openmc,shikhar413/openmc,mit-crpg/openmc,bhermanmit/openmc,paulromano/openmc,wbinventor/openmc,smharper/openmc,samuelshaner/openmc,walshjon/openmc,mjlong/openmc,mjlong/openmc,paulromano/openmc,mit-crpg/openmc,amandalund/openmc,wbinventor/openmc,shikhar413/openmc,samuelshaner/openmc,wbinventor/openmc,walshjon/openmc,shikhar413/openmc,walshjon/openmc,liangjg/openmc,kellyrowland/openmc,smharper/openmc,mit-crpg/openmc,mit-crpg/openmc,amandalund/openmc,samuelshaner/openmc,johnnyliu27/openmc,kellyrowland/openmc,paulromano/openmc,smharper/openmc,liangjg/openmc