Solving the solved conflict.