Fix merge (migrations)