fixing git patch application to non-current branches
fix includes rendering