after merge fixes v2