Fix access to conflict action when resolution attribute is set (fixes #504)