Improve QStringLists holding conflict unit types
Remove Merge::isConflictUnit
Rename Hunk to Chunk and improve its constructor