Yet another attempt to get cluster merging to work