merge from purgatory