CONFLICT DEMO:
 1) Checkout out this revision.
 2) Change the function name from conflict(...) to add(...).
 * More directions to come.