Testing conflict solving.

Line 1 added.