Ignore merge conflict files
Ignore merge conflict files

jrrembert/drop-n-chop,nbumbarger/dropchop,nbumbarger/dropchop,nbumbarger/dropchop,cugos/dropchop,tgirgin23/dropchop,cugos/dropchop,tgirgin23/dropchop,jrrembert/drop-n-chop,jrrembert/drop-n-chop,tgirgin23/dropchop