correcting Unicode handling
preserve creaction date
solving conflicts