[merge] some missing merge stuff or YPR function