cleaned up styles
resolved merge conflict
added skip to pending example for finished activities
removed pending example for roles covered by safe_roles group