diff --git a/pom.xml b/pom.xml
index f94502c..10f266f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -40,6 +40,14 @@
                 <version>3.5.1</version>
                 <configuration>
                     <createDependencyReducedPom>false</createDependencyReducedPom>
+
+                    <!-- Relocate conflicting packages -->
+                    <relocations>
+                        <relocation>
+                            <pattern>io.netty</pattern>
+                            <shadedPattern>me.braydon.feather.shaded.netty</shadedPattern>
+                        </relocation>
+                    </relocations>
                 </configuration>
                 <executions>
                     <execution>
@@ -182,6 +190,12 @@
             <version>2.10.1</version>
             <scope>compile</scope>
         </dependency>
+        <dependency>
+            <groupId>io.netty</groupId>
+            <artifactId>netty-common</artifactId>
+            <version>4.1.104.Final</version>
+            <scope>compile</scope>
+        </dependency>
 
         <!-- Databases -->
         <dependency>