resolve rebase compile errors
resolve rebase compile errors

rwcarlsen/cycamore,jlittell/cycamore,Baaaaam/cyBaM,Baaaaam/cyBaM,gonuke/cycamore,jlittell/cycamore,jlittell/cycamore,cyclus/cycaless,gonuke/cycamore,Baaaaam/cyCLASS,Baaaaam/cyCLASS,rwcarlsen/cycamore,cyclus/cycaless,Baaaaam/cyBaM,jlittell/cycamore,Baaaaam/cycamore,gonuke/cycamore,gonuke/cycamore,rwcarlsen/cycamore,Baaaaam/cycamore,Baaaaam/cycamore,Baaaaam/cyBaM,rwcarlsen/cycamore