diff --git a/rest-client.http b/rest-client.http
index 22de8e8..247fbcb 100644
--- a/rest-client.http
+++ b/rest-client.http
@@ -1,20 +1,12 @@
-<<<<<<< HEAD
-@token = eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJpc3MiOiJodHRwOlwvXC9hZHctYXBpLm9zcHJvLmlkXC9hcGlcL2xvZ2luIiwiaWF0IjoxNjc2NTE5NDQ2LCJleHAiOjE2NzcxMjQyNDYsIm5iZiI6MTY3NjUxOTQ0NiwianRpIjoiTXE4R3QzeTZRMllCMnRCWiIsInN1YiI6MSwicHJ2IjoiMjNiZDVjODk0OWY2MDBhZGIzOWU3MDFjNDAwODcyZGI3YTU5NzZmNyJ9.bXhL34fVSLDvAn4OIqiJnDtUCPcTG-Lyct_WtNPd9K8
-=======
 @token = eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJpc3MiOiJodHRwOlwvXC9sb2NhbGhvc3Q6ODQ0NFwvYXBpXC9sb2dpbiIsImlhdCI6MTY3NjI5MTQwNiwiZXhwIjoxNjc2ODk2MjA2LCJuYmYiOjE2NzYyOTE0MDYsImp0aSI6IkNNRVNGMEcwVzVNQlRLenoiLCJzdWIiOjEyNDcsInBydiI6IjIzYmQ1Yzg5NDlmNjAwYWRiMzllNzAxYzQwMDg3MmRiN2E1OTc2ZjcifQ.ZV2ncAf6H61vnK7fmg-bMfeqBTcxm0aFE5zs_4tor8g
->>>>>>> 9503d9e6c6c146a54eff450ddf364d48acfc184b
 
 @hostname = https://adw-api.ospro.id/api
 # @hostname = https://ospro-api.ospro.id/api
 # @hostname = https://api-iu.ospro.id/api
 # @hostname = https://api-staging-adw.ospro.id/api
-@hostname = http://localhost:8444/api
+# @hostname = http://localhost:8444/api
 # @hostname = http://103.73.125.81:8444/api
-<<<<<<< HEAD
-# @hostname = http://localhost:8074/adw-backend/api
-=======
-# @hostname = http://localhost:8444/adw-ba/api
->>>>>>> 9503d9e6c6c146a54eff450ddf364d48acfc184b
+# @hostname = http://localhost:8444/adw-backend/api
 
 ###### login 
 POST {{hostname}}/login
@@ -813,17 +805,6 @@ POST {{hostname}}/presence/add
 Authorization: Bearer {{token}}
 content-type: application/json
 
-<<<<<<< HEAD
-# {
-#     "clock_out_lat": -6.16678379060529, 
-#     "clock_out_lng": 106.9175039866567,
-#     "clock_time": "2023-02-10T14:48:17+07:00", 
-#     "type": "in", 
-#     "user_id": 1247
-# }
-{"clock_time":"2023-02-14T02:34:28+07:00","type":"in","user_id":1247,"clock_in_lat":-6.2646449,"clock_in_lng":106.7893041}
-
-=======
 {
     "clock_in_lat": -6.16678379060529, 
     "clock_in_lng": 106.9175039866567,
@@ -831,7 +812,6 @@ content-type: application/json
     "type": "in", 
     "user_id": 1247
 }
->>>>>>> 9503d9e6c6c146a54eff450ddf364d48acfc184b
 
 ######
 POST {{hostname}}/presence/add