new repo created
fixed conflicts