Resolve Microprogress Conflicts