Add more conflict types to ConflictFinder
#238
Merged
Loading
ConflictFinder
#238