Fixed Tom's line total thing
Try this
Merge conflicts fixed AGAIN