changes before pull
fix merge