redid one of the reset changes.

Still dont know why it merged master into the branch