fix failed merge, update build