commit before pull
fix merge