add item transcations in process almost complete
fixed merge conflict
??