Add my best friend.
Resolve merge conflict