Resolving conflict and strict errors