Added my information to the rosted, and deleted the merge conflit file