security checks in aspect
merge