diff --git a/pom.xml b/pom.xml
index 04a2c1e..274a55f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>net.sourcewriters.minecraft</groupId>
 	<artifactId>vcompat-parent</artifactId>
-	<version>3.0.4</version>
+	<version>3.0.5</version>
 	<packaging>pom</packaging>
 
 	<distributionManagement>
@@ -91,6 +91,9 @@
 		<module>vcompat-1_17_R1</module>
 		<module>vcompat-1_18_R1</module>
 		<module>vcompat-1_18_R2</module>
+<<<<<<< HEAD
         <module>vcompat-1_19_R1</module>
+=======
+>>>>>>> ef8c634 (Rebase (#41))
 	</modules>
 </project>
diff --git a/scripts/data/mappings.txt b/scripts/data/mappings.txt
index 6e07f0d..25fd59b 100644
--- a/scripts/data/mappings.txt
+++ b/scripts/data/mappings.txt
@@ -1,4 +1,4 @@
 1.17.1
 1.18.1
 1.18.2
-1.19
\ No newline at end of file
+1.19
diff --git a/scripts/data/servers.txt b/scripts/data/servers.txt
index 1d0a6b6..6ffe72c 100644
--- a/scripts/data/servers.txt
+++ b/scripts/data/servers.txt
@@ -16,4 +16,4 @@
 1.17.1
 1.18.1
 1.18.2
-1.19
\ No newline at end of file
+1.19
diff --git a/vcompat-1_17_R1/pom.xml b/vcompat-1_17_R1/pom.xml
index b5baf1e..b06153a 100644
--- a/vcompat-1_17_R1/pom.xml
+++ b/vcompat-1_17_R1/pom.xml
@@ -1,11 +1,9 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>net.sourcewriters.minecraft</groupId>
 		<artifactId>vcompat-parent</artifactId>
-    <version>3.0.5</version>
+		<version>3.0.5</version>
 	</parent>
 	<artifactId>vcompat-1_17_R1</artifactId>
 
@@ -19,7 +17,7 @@
 		<dependency>
 			<groupId>net.sourcewriters.minecraft</groupId>
 			<artifactId>vcompat-api</artifactId>
-            <version>${project.parent.version}</version>
+			<version>${project.parent.version}</version>
 			<scope>provided</scope>
 		</dependency>
 
diff --git a/vcompat-1_18_R1/pom.xml b/vcompat-1_18_R1/pom.xml
index e04c2b0..29a245e 100644
--- a/vcompat-1_18_R1/pom.xml
+++ b/vcompat-1_18_R1/pom.xml
@@ -1,11 +1,9 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>net.sourcewriters.minecraft</groupId>
 		<artifactId>vcompat-parent</artifactId>
-    <version>3.0.5</version>
+		<version>3.0.5</version>
 	</parent>
 	<artifactId>vcompat-1_18_R1</artifactId>
 
@@ -59,7 +57,7 @@
 			<scope>provided</scope>
 		</dependency>
 	</dependencies>
-	
+
 	<build>
 		<plugins>
 			<plugin>
diff --git a/vcompat-1_18_R2/pom.xml b/vcompat-1_18_R2/pom.xml
index 37812ee..28cc751 100644
--- a/vcompat-1_18_R2/pom.xml
+++ b/vcompat-1_18_R2/pom.xml
@@ -1,11 +1,9 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>net.sourcewriters.minecraft</groupId>
 		<artifactId>vcompat-parent</artifactId>
-    <version>3.0.5</version>
+		<version>3.0.5</version>
 	</parent>
 	<artifactId>vcompat-1_18_R2</artifactId>
 
@@ -65,7 +63,7 @@
 			<scope>provided</scope>
 		</dependency>
 	</dependencies>
-	
+
 	<build>
 		<plugins>
 			<plugin>
diff --git a/vcompat-1_18_R2/src/main/java/net/sourcewriters/minecraft/vcompat/provider/impl/v1_18_R2/entity/Player1_18_R2.java b/vcompat-1_18_R2/src/main/java/net/sourcewriters/minecraft/vcompat/provider/impl/v1_18_R2/entity/Player1_18_R2.java
index f9e7817..6d3aa5c 100644
--- a/vcompat-1_18_R2/src/main/java/net/sourcewriters/minecraft/vcompat/provider/impl/v1_18_R2/entity/Player1_18_R2.java
+++ b/vcompat-1_18_R2/src/main/java/net/sourcewriters/minecraft/vcompat/provider/impl/v1_18_R2/entity/Player1_18_R2.java
@@ -279,8 +279,13 @@ private final void update(boolean flag) {
                 properties.put("textures", new Property("textures", skin.getValue(), skin.getSignature()));
             }
 
+<<<<<<< HEAD
             String name = dataAdapter.get("name", WrapType.STRING);
             if (name != null && !name.isBlank()) {
+=======
+            String name = getName();
+            if (name != null) {
+>>>>>>> ef8c634 (Rebase (#41))
                 VersionCompatProvider.get().getLookupProvider().getLookup("mjGameProfile").setFieldValue(profile, "name", name);
             }
 
diff --git a/vcompat-core/pom.xml b/vcompat-core/pom.xml
index c254ce1..e2b97e7 100644
--- a/vcompat-core/pom.xml
+++ b/vcompat-core/pom.xml
@@ -7,17 +7,17 @@
     </parent>
     <artifactId>vcompat</artifactId>
 
-    <dependencies>
+	<dependencies>
 
-        <!-- vCompat Api -->
+		<!-- vCompat Api -->
 
-        <dependency>
-            <groupId>net.sourcewriters.minecraft</groupId>
-            <artifactId>vcompat-api</artifactId>
-            <version>${project.parent.version}</version>
-        </dependency>
+		<dependency>
+			<groupId>net.sourcewriters.minecraft</groupId>
+			<artifactId>vcompat-api</artifactId>
+			<version>${project.parent.version}</version>
+		</dependency>
 
-        <!-- vCompat Versions -->
+		<!-- vCompat Versions -->
 
         <dependency>
             <groupId>net.sourcewriters.minecraft</groupId>
@@ -46,46 +46,46 @@
         </dependency>
     </dependencies>
 
-    <build>
-        <plugins>
-            <plugin>
-                <artifactId>maven-shade-plugin</artifactId>
-                <version>3.2.4</version>
-                <executions>
-                    <execution>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>shade</goal>
-                        </goals>
-                    </execution>
-                </executions>
-                <configuration>
-                    <filters>
-                        <filter>
-                            <artifact>*:*</artifact>
-                            <excludes>
-                                <exclude>META-INF/*.SF</exclude>
-                                <exclude>META-INF/*.DSA</exclude>
-                                <exclude>META-INF/*.RSA</exclude>
-                            </excludes>
-                        </filter>
-                    </filters>
-                    <relocations>
-                        <relocation>
-                            <pattern>com.syntaxphoenix.syntaxapi</pattern>
-                            <shadedPattern>net.sourcewriters.minecraft.vcompat.shaded.syntaxapi</shadedPattern>
-                        </relocation>
-                    </relocations>
-                </configuration>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-deploy-plugin</artifactId>
-                <version>3.0.0-M2</version>
-                <configuration>
-                    <skip>false</skip>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
+	<build>
+		<plugins>
+			<plugin>
+				<artifactId>maven-shade-plugin</artifactId>
+				<version>3.2.4</version>
+				<executions>
+					<execution>
+						<phase>package</phase>
+						<goals>
+							<goal>shade</goal>
+						</goals>
+					</execution>
+				</executions>
+				<configuration>
+					<filters>
+						<filter>
+							<artifact>*:*</artifact>
+							<excludes>
+								<exclude>META-INF/*.SF</exclude>
+								<exclude>META-INF/*.DSA</exclude>
+								<exclude>META-INF/*.RSA</exclude>
+							</excludes>
+						</filter>
+					</filters>
+					<relocations>
+						<relocation>
+							<pattern>com.syntaxphoenix.syntaxapi</pattern>
+							<shadedPattern>net.sourcewriters.minecraft.vcompat.shaded.syntaxapi</shadedPattern>
+						</relocation>
+					</relocations>
+				</configuration>
+			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-deploy-plugin</artifactId>
+				<version>3.0.0-M2</version>
+				<configuration>
+					<skip>false</skip>
+				</configuration>
+			</plugin>
+		</plugins>
+	</build>
 </project>
\ No newline at end of file