add merge conflicted sql
add merge conflicted sql

alexispeter/CM,fauvel/CM,zazabe/cm,njam/CM,tomaszdurka/CM,fauvel/CM,mariansollmann/CM,fauvel/CM,alexispeter/CM,fvovan/CM,njam/CM,vogdb/cm,mariansollmann/CM,zazabe/cm,vogdb/cm,vogdb/cm,tomaszdurka/CM,fvovan/CM,mariansollmann/CM,alexispeter/CM,vogdb/cm,zazabe/cm,vogdb/cm,cargomedia/CM,christopheschwyzer/CM,cargomedia/CM,fauvel/CM,christopheschwyzer/CM,tomaszdurka/CM,alexispeter/CM,fvovan/CM,tomaszdurka/CM,fauvel/CM,christopheschwyzer/CM,christopheschwyzer/CM,cargomedia/CM,njam/CM,fvovan/CM,njam/CM,cargomedia/CM,tomaszdurka/CM,njam/CM,mariansollmann/CM,zazabe/cm