towards resolving conflicts