I made this update from my laptop.  Changes should conflict now.
Commit after merge conflict.