fix 02 conflict analysis