chaged theerror
fixed conflicts in theerror