removing error conflicts