preparing for pull
fixed conflicts