merge texdc/money