Resolve on_complete conflict