diff --git a/app/src/main/java/id/ac/ubharajaya/sistemakademik/MainActivity.kt b/app/src/main/java/id/ac/ubharajaya/sistemakademik/MainActivity.kt
index f6fefb5..ec9c8a2 100644
--- a/app/src/main/java/id/ac/ubharajaya/sistemakademik/MainActivity.kt
+++ b/app/src/main/java/id/ac/ubharajaya/sistemakademik/MainActivity.kt
@@ -104,13 +104,11 @@ fun kirimKeN8n(
             val responseCode = conn.responseCode
 
             context.runOnUiThread {
-<<<<<<< HEAD
                 if (responseCode == 200) {
                     onSuccess()
                 } else {
                     onError()
                 }
-=======
                 Toast.makeText(
                     context,
                     if (responseCode == 200)