Fix : error in merge
Update following merge