check conflict sql fix