Rectify merge issue