fixed more rebase issues. Seems to be passing the tests it used to pass now
fixed more rebase issues. Seems to be passing the tests it used to pass now

amandalund/openmc,smharper/openmc,smharper/openmc,mit-crpg/openmc,liangjg/openmc,smharper/openmc,walshjon/openmc,walshjon/openmc,paulromano/openmc,walshjon/openmc,amandalund/openmc,shikhar413/openmc,amandalund/openmc,mit-crpg/openmc,paulromano/openmc,mit-crpg/openmc,shikhar413/openmc,paulromano/openmc,paulromano/openmc,shikhar413/openmc,walshjon/openmc,amandalund/openmc,liangjg/openmc,liangjg/openmc,mit-crpg/openmc,liangjg/openmc,smharper/openmc,shikhar413/openmc