Replace git stash in favor of reset hard (#704)

Replace git stash in favor of reset hard (#704) #144