slove conflict