starting repository
fixed conflicts