Resolving a conflict.