Remove conflict resolution annotations

In a prior conflict resolution, the "========" and other related annotations
were left in the app/controller/List.js file and the conflict never resolved.
This commit resolves the conflict and removes said annotation from the file.