Resolved a conflict.