Did not remove conflict markers for similar text on the home page
Merge pull request #49 from scottelundgren/unresolved-conflicts

Did not remove conflict markers for similar text on the home page