adds groups to application controller
fixes merge conflict