Merge and some other stuff...