Solve conflict.