Reads multiple transactions files now, changed how we handle previous user
Resolved merge conflict