Fix migrations after merge