init commit
fixed conflicts/init commit