diff --git a/assets/scripts/app/templates/layouts/top.hbs b/assets/scripts/app/templates/layouts/top.hbs
index d3897554..c6355dae 100644
--- a/assets/scripts/app/templates/layouts/top.hbs
+++ b/assets/scripts/app/templates/layouts/top.hbs
@@ -25,7 +25,7 @@
- We're Hiring!
+ We're Hiring!
Travis CI for Private Repositories
diff --git a/assets/styles/top.sass b/assets/styles/top.sass
index 0ed2867c..9ceae7c0 100644
--- a/assets/styles/top.sass
+++ b/assets/styles/top.sass
@@ -32,9 +32,14 @@
a.werehiring
background-color: #31363d
border-radius: 4px
+<<<<<<< HEAD
padding: 8px 16px
line-height: 20px
margin-right: 80px
+=======
+ padding: 6px 18px 6px 18px
+ display: inline
+>>>>>>> b51ca7e50adb765bd44d2ad4aaf52707e4378dfd
li.traviscicom
a