do not assume session and file has 1:1 mapping
conflict resolution