Use custom Git Gem
Replace Merge with Patch Apply