conflict detection is broken.  looking at diff now.