fixed error
fixed conflicts