Merging from fedtools