try to reset. no changes
Merge branch 'master' of https://github.com/jswope00/ed-sandbox2