merge fixes.