repo token inherited from current user
conflict resolved