NXP-13617: Always consider as a conflict a remote and/or local change of a matched file when reinitializing database