Fix it so merge button only shown to admin users
Fix categories page not showing
Include fix in commit this time