confirmation screen on the way
fixed conflicts