correction validation confirm password
conflict resolve