created git repo
fixed conflicts