Resolve conflicts in app/policies/group_policy.rb
Resolve conflicts in app/policies/group_policy.rb

iiet/iiet-git,iiet/iiet-git,mmkassem/gitlabhq,mmkassem/gitlabhq,iiet/iiet-git,mmkassem/gitlabhq,stoplightio/gitlabhq,stoplightio/gitlabhq,mmkassem/gitlabhq,stoplightio/gitlabhq,stoplightio/gitlabhq,iiet/iiet-git