If two users are editing the same file from different bases and a conflict arises, throw a 409

[zaknelson]

This is partially mitigated by the fact that currently all edits will go through the review process, so reviewers can manage conflicts.