Fix merge issue

Comment old code