Initial commit 2
fixed conflicts