uploading first code
fixed conflicts