Improve const-correctness in FilePersistence::Merge
Combine Merge::initialize with constructor
Improve implementation of Merge::buildConflictUnitMap