fixed migration clash