fixed password confirmation
fixing conflicts
merge conflict