~sbeattie/conflictchecker/conflictchecker-fixups

1
tmp