checking in
fixed conflicts