Fix conflict[] => conflicts[] typo.
Merge pull request #1 from esilkensen/master

Save conflicts when submitting a paper.
Woops, thanks!