[Bug 881858] file conflicts between postgresql92 and postgresql93