password functionality
merge