Fixed a minor error
Handled merge conflict