new merge and other stuff

please use them