switching to and from wip/ branch works