Merge pull request #5786 from neighbourhoodie/19-find-conflicts Port Python test to Elixir: `19-find-conflicts`