conflict corrections