Changed merging algorithm, still buggy