Fifth commit.  Should have conflict.
Resolved conflicts by using local copy