putting error codes
resolving conflict