Added conflict resolution for updating hours.