use ConflictManager.strict, added more file utilities