diff --git a/Ruby/lib/terminal_notifier/guard/failed.rb b/Ruby/lib/terminal_notifier/guard/failed.rb
index e45863d..c0d560a 100644
--- a/Ruby/lib/terminal_notifier/guard/failed.rb
+++ b/Ruby/lib/terminal_notifier/guard/failed.rb
@@ -1,7 +1,19 @@
 module TerminalNotifier
   module Guard
     module Failed
+<<<<<<< Updated upstream
       BIN_PATH = File.expand_path('../../../../vendor/terminal-notifier-failed.app/Contents/MacOS/terminal-notifier', __FILE__)
+=======
+      terminal_notifier_path = `which terminal-notifier`
+      if File.symlink? terminal_notifier_path
+        terminal_notifier_path = File.expand_path(File.readlink(terminal_notifier_path), __FILE__)
+      end
+
+      BIN_PATH = terminal_notifier_path.empty? ?
+        File.expand_path('../../../../vendor/terminal-notifier-failed.app/Contents/MacOS/terminal-notifier', __FILE__)
+        :
+        terminal_notifier_path
+>>>>>>> Stashed changes
     end
   end
 end
diff --git a/Ruby/lib/terminal_notifier/guard/notify.rb b/Ruby/lib/terminal_notifier/guard/notify.rb
index 6e639fa..e691cbf 100644
--- a/Ruby/lib/terminal_notifier/guard/notify.rb
+++ b/Ruby/lib/terminal_notifier/guard/notify.rb
@@ -1,7 +1,19 @@
 module TerminalNotifier
   module Guard
     module Notify
+<<<<<<< Updated upstream
       BIN_PATH = File.expand_path('../../../../vendor/terminal-notifier-failed.app/Contents/MacOS/terminal-notifier', __FILE__)
+=======
+      terminal_notifier_path = `which terminal-notifier`
+      if File.symlink? terminal_notifier_path
+        terminal_notifier_path = File.expand_path(File.readlink(terminal_notifier_path), __FILE__)
+      end
+
+      BIN_PATH = terminal_notifier_path.empty? ?
+        File.expand_path('../../../../vendor/terminal-notifier-failed.app/Contents/MacOS/terminal-notifier', __FILE__)
+        :
+        terminal_notifier_path
+>>>>>>> Stashed changes
     end
   end
 end
diff --git a/Ruby/lib/terminal_notifier/guard/pending.rb b/Ruby/lib/terminal_notifier/guard/pending.rb
index 98e036f..5bc889e 100644
--- a/Ruby/lib/terminal_notifier/guard/pending.rb
+++ b/Ruby/lib/terminal_notifier/guard/pending.rb
@@ -1,7 +1,19 @@
 module TerminalNotifier
   module Guard
     module Pending
+<<<<<<< Updated upstream
       BIN_PATH = File.expand_path('../../../../vendor/terminal-notifier-failed.app/Contents/MacOS/terminal-notifier', __FILE__)
+=======
+      terminal_notifier_path = `which terminal-notifier`
+      if File.symlink? terminal_notifier_path
+        terminal_notifier_path = File.expand_path(File.readlink(terminal_notifier_path), __FILE__)
+      end
+
+      BIN_PATH = terminal_notifier_path.empty? ?
+        File.expand_path('../../../../vendor/terminal-notifier-failed.app/Contents/MacOS/terminal-notifier', __FILE__)
+        :
+        terminal_notifier_path
+>>>>>>> Stashed changes
     end
   end
 end
diff --git a/Ruby/lib/terminal_notifier/guard/success.rb b/Ruby/lib/terminal_notifier/guard/success.rb
index f1a78b2..b73b65d 100644
--- a/Ruby/lib/terminal_notifier/guard/success.rb
+++ b/Ruby/lib/terminal_notifier/guard/success.rb
@@ -1,7 +1,19 @@
 module TerminalNotifier
   module Guard
     module Success
+<<<<<<< Updated upstream
       BIN_PATH = File.expand_path('../../../../vendor/terminal-notifier-failed.app/Contents/MacOS/terminal-notifier', __FILE__)
+=======
+      terminal_notifier_path = `which terminal-notifier`
+      if File.symlink? terminal_notifier_path
+        terminal_notifier_path = File.expand_path(File.readlink(terminal_notifier_path), __FILE__)
+      end
+
+      BIN_PATH = terminal_notifier_path.empty? ?
+        File.expand_path('../../../../vendor/terminal-notifier-failed.app/Contents/MacOS/terminal-notifier', __FILE__)
+        :
+        terminal_notifier_path
+>>>>>>> Stashed changes
     end
   end
 end