Add friend database update
Resolve conflicts