This branch is now using object-merge for merging