combined changes