Allow custom types as integrity check result if needed
Clean up after merge conflict