added ability to make new transactions
fixed merge