change line item controller test
Make a merge conflict between branches
another change
Second change to create merge conflict
Resolve merge conflict
Fix current card bug causing sessions to not work