clean up merge issues, remove user/password index