Correcting Merge Conflicts in ShoopingList Refactor Branch