adjusted view so merge entry should only appear for admin
undone last commit
Corrected admin-only merge feature