rollback point prior to switching branches and experimenting with moving actions to controller