finaly merged