made some changes
Fixed the merge conflict