base code
fixed conflicts