initial commit
fixed conflicts