File conflicts from procps-lang