Corrupted merge while migrating from 0.20.5 to 0.90.5