added in funciton
fixed conflicts