Fix the Error conflict