Survived the merge failure