Remove ability for non-owners to edit items
Resolve merge conflicts