Methods of resolving conflicts