navigator update, auth update
resolve conflict