Fixed weird merge error where my changes were being overwritten with old stuff. Hopefully this works.
Fixed merge conflict in CaseHubContract.