some work
changes
fixed conflicts