add guard
add guard .Merge branch 'dev'