fixed merge conflict
Merge pull request #2 from mbaptist23/checklist

fixed merge conflict