removed messaging for admin
resolved merge conflict