fix conflict

Author: SpaceWalkerRS

mappings/12w18a-client#12w17a-client.tinydiff

@@ -1646,7 +1646,7 @@ c	net/minecraft/unmapped/C_5956487	net/minecraft/client/ClientPlayerInteractionM
 		p	1			p_1
 		p	2			p_2
 	m	()V	m_7429100	updateSelectedHotbarSlot	sendSelectedHotbarSlot
-	m	(Lnet/minecraft/unmapped/C_9590849;)V	m_7810696	initPlayer	setFacingSouth
+	m	(Lnet/minecraft/unmapped/C_9590849;)V	m_7810696	initPlayer	m_7810696
 	m	(Lnet/minecraft/unmapped/C_2454309;I)V	m_4243379	addItemToCreativeMenu	addStackToCreativeMenu
 		p	1		item	stack
 		p	2		slot	slotId

mappings/a1.0.5-2149-client#a1.0.4-client.tinydiff

@@ -359,7 +359,7 @@ c	net/minecraft/unmapped/C_5956487	net/minecraft/client/MultiplayerInteractionMa
 	f	I	f_3767729	miningCooldown	
 	m	(Lnet/minecraft/unmapped/C_5664496;)V	<init>	<init>	
 		p	1		p_1	
-	m	(Lnet/minecraft/unmapped/C_9590849;)V	m_7810696	setFacingSouth	
+	m	(Lnet/minecraft/unmapped/C_9590849;)V	m_7810696	m_7810696	
 		p	1		player	
 	m	()V	m_0263105	m_0263105	
 	m	(III)Z	m_3937629	m_3937629