Merge different-oil branch