simplified things
fixed conflicts