* changes - intermediate
merge