Fix attempt for lhw2 - prevent nonadmin from seeing merge form