Git Merge Two Branches With Different History