Catch permission errors with publishing
Resolve merge issues