actually resolve missed conflicts