Tag: resolve conflicts with friends