- prepare for a shorter storage model without any resolution
- remark : wrong merge code ( dverged on two latptops .. ) possible loss