Added my information to the roster, and deleted the merge conflict file