- Merge patch from last commit the right way