restored repo
fixed conflicts