small fixes
fix merge