diff --git a/Hous-iOS-release/Scene/Profile/View/ViewController/ProfileAlarmSettingViewController.swift b/Hous-iOS-release/Scene/Profile/View/ViewController/ProfileAlarmSettingViewController.swift
index fff324b7..a72b5932 100644
--- a/Hous-iOS-release/Scene/Profile/View/ViewController/ProfileAlarmSettingViewController.swift
+++ b/Hous-iOS-release/Scene/Profile/View/ViewController/ProfileAlarmSettingViewController.swift
@@ -32,13 +32,8 @@ final class ProfileAlarmSettingViewController: BaseViewController, LoadingPresen
 
   private let navigationBarView = NavBarWithBackButtonView(
     title: "알림",
-<<<<<<< Updated upstream
-    rightButtonText: ""
-  )
-=======
     rightButtonText: "",
     isSeparatorLineHidden: false)
->>>>>>> Stashed changes
 
   private let alarmSettingCollectionView: UICollectionView = {
     let layout = UICollectionViewFlowLayout()