added new promise navigation
fixed conflicts