first commit
fixed conflicts