Trying hard to make the merging work