adding new files
fixed conflicts