Resolving a conflict