We haven't combined two hour types, but we have stopped using several in favor of others to simplify. To make sure that we didn't lose any of the data (for reporting) we just removed the hour from the timesheet profile we have for our users - this essentially deactivated it and we didn't lose any of the original data