fixing merge

Fixed the merge