minor changes
fix merge