Eliminating conflict errors