Removed second sentence from 2nd paragraph
Handled conflitcs