This should cause a conflict.  Negative values on local machine shold go
to 8
We performed the merge by choosing how we wanted to deal with the
conflicts.