COmmit 1 on topic 4 that should conflict
Merge pull request #1 from calvinwiebe/topic4

COmmit 1 on topic 4 that should conflict