deleted everything
fixed conflicts