after merge fixes