ICBM Conflic fix failed, restoring conflict with AtomicScience