resolve failed merge resolution in hit-check-libs