Fix models after merge