Merging, hopefully