Fixing up the merge algo
temporary state