ChangesCommittedFromBibleditWeb
FixMergeConflicts