customer transactions
resolved merge conflicts