transations working between single user and admin
merge conflicts fixed