Fixed stock form again after failed merge