migrate: fix merge fail