This is a pretty monstrous file, and will only grow as we continue to add complexity to diff policies (like different kinds of conflict resolution). Worth pulling out the categories into their own files?