added a few lines
fixed conflicts