diff --git a/api/resolvers/item.js b/api/resolvers/item.js
index 10690cc2c..2f824b68f 100644
--- a/api/resolvers/item.js
+++ b/api/resolvers/item.js
@@ -16,15 +16,8 @@ import { advSchema, amountSchema, bountySchema, commentSchema, discussionSchema,
 import { sendUserNotification } from '../webPush'
 import { defaultCommentSort } from '../../lib/item'
 import { notifyItemParents, notifyUserSubscribers, notifyZapped } from '../../lib/push-notifications'
-import { createHmac } from './wallet'
-import { settleHodlInvoice } from 'ln-service'
 import { initDateRule } from '../../lib/timedate-scraper'
-<<<<<<< HEAD
-import { moreThanOneYearAgo } from '../../lib/time'
-=======
 import { datePivot } from '../../lib/time'
-import { notifyItemParents, notifyUserSubscribers, notifyZapped } from '../../lib/push-notifications'
->>>>>>> 7be35e0 (address review comments)
 
 export async function commentFilterClause (me, models) {
   let clause = ` AND ("Item"."weightedVotes" - "Item"."weightedDownVotes" > -${ITEM_FILTER_THRESHOLD}`