Merge proposals

tidy in Ubuntu has no merge proposals.