oh, actually you have broken merge stuff in here.  No wonder it wouldn't merge right.