ShoppingList: fix for rebase error on application.js