tweak after merge