merged conflicts. Friends favorites logic