fixed merging problems, now it should all work. I did some tests and it goes well.