Initial commit
fixed conflicts