support for multiple users
merge conf fix