3.05: fix bad conflict resolution