Added transaction id n checks
Fixed merge conflits