password confirmation
fixed conflict