all changes in a single patch, clean against latest git version