[#67767620] fixed merge conflicts

Author: Michael Beattie

EasyReader.xcodeproj/project.pbxproj

@@ -1381,12 +1381,12 @@
 				9D639E6C18E0934800350B5F /* CSUserFeedCell.m in Sources */,
 				9D639E7218E0A4E000350B5F /* APIClient.m in Sources */,
 				9D16D34F18DBA9E9001E9C38 /* APIRouter.m in Sources */,
+				0D9A835A18E0AA4300D8376E /* CSSearchFeedCell.m in Sources */,
 				9D16D34F18DBA9E9001E9C38 /* AKRouter.m in Sources */,
 				9D096C3418DCE9D50043423B /* CSMenuSearchFeedDataSource.m in Sources */,
 				9D79271518DA1D0300E1D3E1 /* CSFeedItemUpdater.m in Sources */,
 				9D639E7E18E0A53100350B5F /* APIMockResponse.m in Sources */,
 				9D79271718DA1D0300E1D3E1 /* CSMenuLeftViewController.m in Sources */,
-				9D639E6918E08CED00350B5F /* CSSearchFeedCell.m in Sources */,
 				9D79271918DA1D0300E1D3E1 /* Easy Reader.xcdatamodeld in Sources */,
 				9D16D32918DB57D0001E9C38 /* CSRegisterRoutesService.m in Sources */,
 				9D79271A18DA1D0300E1D3E1 /* CSFeedAddViewController.m in Sources */,
@@ -1422,9 +1422,8 @@
 				9D79275718DA1D3800E1D3E1 /* FeedItem.m in Sources */,
 				9D79275818DA1D3800E1D3E1 /* User.m in Sources */,
 				9D096C3818DCE9D80043423B /* CSMenuUserFeedDataSource.m in Sources */,
-				9D639E6D18E0934800350B5F /* CSUserFeedCell.m in Sources */,
 				9D639E7318E0A4E000350B5F /* APIClient.m in Sources */,
-				9D16D35018DBA9E9001E9C38 /* APIRouter.m in Sources */,
+				0D9A835818E0AA4000D8376E /* CSUserFeedCell.m in Sources */,
 				9D16D35018DBA9E9001E9C38 /* AKRouter.m in Sources */,
 				9D096C3518DCE9D50043423B /* CSMenuSearchFeedDataSource.m in Sources */,
 				9D79275918DA1D3800E1D3E1 /* CSFeedItemUpdater.m in Sources */,
@@ -1477,11 +1476,11 @@
 				9D639E7718E0A52300350B5F /* APIMockRequest.m in Sources */,
 				9D9CBAD418DCC68A00532F8C /* APIRouter.m in Sources */,
 				9D9CBAD518DCC68A00532F8C /* CSFeedItemUpdater.m in Sources */,
-				9D639E6B18E0934700350B5F /* CSUserFeedCell.m in Sources */,
+				0D9A835918E0AA4300D8376E /* CSSearchFeedCell.m in Sources */,
+				0D9A835618E0AA3F00D8376E /* CSUserFeedCell.m in Sources */,
 				9D096C3318DCE9D40043423B /* CSMenuSearchFeedDataSource.m in Sources */,
 				9D9CBAD718DCC68A00532F8C /* CSMenuLeftViewController.m in Sources */,
 				9D9CBAD918DCC68A00532F8C /* Easy Reader.xcdatamodeld in Sources */,
-				9D639E6818E08CED00350B5F /* CSSearchFeedCell.m in Sources */,
 				9D9CBADA18DCC68A00532F8C /* CSRegisterRoutesService.m in Sources */,
 				9D9CBADB18DCC68A00532F8C /* CSFeedAddViewController.m in Sources */,
 				9D9CBADC18DCC68A00532F8C /* NSObject+CSNilAdditions.m in Sources */,