putting all the files up
fixed conflicts