Fixed postgresql wiki pages produced on merge error