added files
fixed conflicts