Repushing to github
fixed conflicts