Fix #1570 : php 4.2.x error on conflict merging