add migration from merge conflict
add migration from merge conflict

NumberZeroSoftware/PDFINVEST,NumberZeroSoftware/PDFINVEST,NumberZeroSoftware/PDFINVEST,NumberZeroSoftware/PDFINVEST,NumberZeroSoftware/PDFINVEST