commit before pull
fixed conflicts