Solving a conflict.