...
[16:33:57 CDT(-0500)] <colinclark> I suppose it's a lot easier to keep track
[16:36:29 CDT(-0500)] <colinclark> It's really odd that Git found conflicts in this merge
[16:36:33 CDT(-0500)] <colinclark> since it's pretty clear to me what changed
[16:36:40 CDT(-0500)] <Bosmon> They are probably in the five-star demo
[16:36:41 CDT(-0500)] <Bosmon> ?
[16:36:50 CDT(-0500)] <colinclark> yep
[16:37:06 CDT(-0500)] <colinclark> two very obvious ones
[16:37:08 CDT(-0500)] <Bosmon> There was still a "diamond change"
[16:37:20 CDT(-0500)] <Bosmon> So it could never have been certain that the other changes were not required