preliminary friend creation
fixed conflicts