Further along with the merge - still not working