rectified conflict