fixed it
Fixed merge issue
Minor fix