Merge proposals

dotconf in Ubuntu has no merge proposals.