trying to recreate previous state before merge