added e
fixed conflicts