resolve
example of resolving conflicts