Trying to correct a failed fetch / merge / pull permssions issue.
Trying to resolve local conflict with permisssions!
Trying to resolve conflict with permissions changes.
Trying to resolve conflocts and get back to head.
Merge branch 'master' of github.com:nuvoleweb/d8