fix extra friend
change picture on core data
resolve merge