Minor fix

fixed the merge issue and removed some redundancy.