some reason had error when merged, fixed