diff --git a/auto-bid-admin/src/apis/bid.ts b/auto-bid-admin/src/apis/bid.ts
index f367e72..0813b94 100644
--- a/auto-bid-admin/src/apis/bid.ts
+++ b/auto-bid-admin/src/apis/bid.ts
@@ -115,6 +115,6 @@ export const getImagesWorking = async (values: (IBid | IWebBid) & { type: string
 
         return data;
     } catch (error) {
-        handleError(error);
+        console.log('%csrc/apis/bid.ts:118 error', 'color: #007acc;', error);
     }
 };
diff --git a/auto-bid-admin/src/components/bid/show-histories-bid-pickles-api-modal.tsx b/auto-bid-admin/src/components/bid/show-histories-bid-pickles-api-modal.tsx
index 67d68c6..ac05429 100644
--- a/auto-bid-admin/src/components/bid/show-histories-bid-pickles-api-modal.tsx
+++ b/auto-bid-admin/src/components/bid/show-histories-bid-pickles-api-modal.tsx
@@ -20,11 +20,7 @@ export default function ShowHistoriesBidPicklesApiModal({ data, onUpdated, ...pr
             <Table.Tr key={index}>
                 <Table.Td>{element['bidderAnonName']}</Table.Td>
                 <Table.Td>{element['actualBid']}</Table.Td>
-<<<<<<< HEAD
-                <Table.Td>{formatTime(new Date(element['bidTimeInMilliSeconds']).toUTCString())}</Table.Td>
-=======
                 <Table.Td>{formatTime(new Date(element['bidTimeInMilliSeconds']).toUTCString(), 'HH:mm:ss DD/MM/YYYY')}</Table.Td>
->>>>>>> 26b10a7 (pickxel and fix login)
             </Table.Tr>
         ));
     }, [histories]);
diff --git a/auto-bid-admin/src/utils/index.ts b/auto-bid-admin/src/utils/index.ts
index 06b8e46..02957ea 100644
--- a/auto-bid-admin/src/utils/index.ts
+++ b/auto-bid-admin/src/utils/index.ts
@@ -3,10 +3,7 @@
 import { clsx, type ClassValue } from "clsx";
 import { twMerge } from "tailwind-merge";
 import moment from "moment";
-<<<<<<< HEAD
-=======
 import { IWebBid } from "../system/type";
->>>>>>> 26b10a7 (pickxel and fix login)
 export function cn(...args: ClassValue[]) {
   return twMerge(clsx(args));
 }
@@ -154,8 +151,6 @@ export function stringToColor(str: string): string {
   const hash = hashStringToInt(str);
   const index = hash % colorPalette.length;
   return colorPalette[index];
-<<<<<<< HEAD
-=======
 }
 
 export function findEarlyLoginTime(webBid: IWebBid): string | null {
@@ -180,5 +175,4 @@ export function findEarlyLoginTime(webBid: IWebBid): string | null {
   closeTime.setSeconds(closeTime.getSeconds() - (webBid.early_login_seconds || 0));
 
   return closeTime.toISOString();
->>>>>>> 26b10a7 (pickxel and fix login)
 }
diff --git a/auto-bid-server/src/modules/bids/apis/grays.api.ts b/auto-bid-server/src/modules/bids/apis/grays.api.ts
index e385db2..23da68d 100644
--- a/auto-bid-server/src/modules/bids/apis/grays.api.ts
+++ b/auto-bid-server/src/modules/bids/apis/grays.api.ts
@@ -21,10 +21,7 @@ export class GraysApi {
 
       switch(bid.web_bid.origin_url){
 
-<<<<<<< HEAD
-=======
         // GRAYS
->>>>>>> 26b10a7 (pickxel and fix login)
         case 'https://www.grays.com': {
           const response = await axios({
             url: `https://www.grays.com/api/LotInfo/GetBiddingHistory?lotId=${lot_id}&currencyCode=AUD`,
@@ -36,11 +33,8 @@ export class GraysApi {
 
           return AppResponse.toResponse([])
         }
-<<<<<<< HEAD
-=======
 
         // PICKLES
->>>>>>> 26b10a7 (pickxel and fix login)
         case 'https://www.pickles.com.au': {
           
           const response = await axios({
@@ -48,11 +42,7 @@ export class GraysApi {
           });
     
           if (response.data) {
-<<<<<<< HEAD
-            return AppResponse.toResponse(response.data);
-=======
             return AppResponse.toResponse(response.data.Bids);
->>>>>>> 26b10a7 (pickxel and fix login)
           }
 
           return AppResponse.toResponse([])
diff --git a/auto-bid-server/src/modules/bids/controllers/client/bids.controller.ts b/auto-bid-server/src/modules/bids/controllers/client/bids.controller.ts
index 6079a5e..1b2b433 100644
--- a/auto-bid-server/src/modules/bids/controllers/client/bids.controller.ts
+++ b/auto-bid-server/src/modules/bids/controllers/client/bids.controller.ts
@@ -79,14 +79,14 @@ export class BidsController {
   @Post('test')
   async test(@Body('code') code: string) {
     const webBid = await this.webBidService.webBidRepo.findOne({
-      where: { id: 4 },
-      // where: { id: 1 },
+      // where: { id: 4 },
+      where: { id: 1 },
     });
 
     this.eventEmitter.emit(Event.verifyCode(webBid), {
       code,
-      name: 'LAWSONS',
-      // name: 'LANGTONS',
+      // name: 'LAWSONS',
+      name: 'LANGTONS',
       web_bid: plainToClass(WebBid, webBid),
     });