adding files
fixed conflicts