add changes
fix merge