correct merge errors migration