diff --git a/rpcs3/Emu/SysCalls/Modules/cellAudio.cpp b/rpcs3/Emu/SysCalls/Modules/cellAudio.cpp
index 1787456e3a..1c72cbcae2 100644
--- a/rpcs3/Emu/SysCalls/Modules/cellAudio.cpp
+++ b/rpcs3/Emu/SysCalls/Modules/cellAudio.cpp
@@ -2,75 +2,6 @@
 #include "Emu/SysCalls/SysCalls.h"
 #include "Emu/SysCalls/SC_FUNC.h"
 
-<<<<<<< HEAD
-														
-// Initialization and Termination Functions;
-
-void cellAudio_init ();
-Module cellAudio (0x0011, cellAudio_init);
-
-enum 
-{
-//libaudio ERROR_CODES
-CELL_AUDIO_ERROR_ALREADY_INIT				= 0x80310701,  
-CELL_AUDIO_ERROR_AUDIOSYSTEM				= 0x80310702, 
-CELL_AUDIO_ERROR_NOT_INIT					= 0x80310703, 
-CELL_AUDIO_ERROR_PARAM						= 0x80310704, 
-CELL_AUDIO_ERROR_PORT_FULL					= 0x80310705,   
-CELL_AUDIO_ERROR_PORT_ALREADY_RUN			= 0x80310706, 
-CELL_AUDIO_ERROR_PORT_NOT_OPEN				= 0x80310707,  
-CELL_AUDIO_ERROR_PORT_NOT_RUN				= 0x80310708,   
-CELL_AUDIO_ERROR_TRANS_EVENT				= 0x80310709, 
-CELL_AUDIO_ERROR_PORT_OPEN					= 0x8031070a,  
-CELL_AUDIO_ERROR_SHAREDMEMORY				= 0x8031070b, 
-CELL_AUDIO_ERROR_MUTEX						= 0x8031070c, 
-CELL_AUDIO_ERROR_EVENT_QUEUE				= 0x8031070d,  
-CELL_AUDIO_ERROR_AUDIOSYSTEM_NOT_FOUND      = 0x8031070e,
-CELL_AUDIO_ERROR_TAG_NOT_FOUND				= 0x8031070f,
-
-//libmixer ERROR_CODES
-CELL_LIBMIXER_ERROR_NOT_INITIALIZED         = 0x80310002,
-CELL_LIBMIXER_ERROR_INVALID_PARAMATER       = 0x80310003,
-CELL_LIBMIXER_ERROR_NO_MEMORY				= 0x80310005,
-CELL_LIBMIXER_ERROR_ALREADY_EXIST		    = 0x80310006, 
-CELL_LIBMIXER_ERROR_FULL					= 0x80310007,
-CELL_LIBMIXER_ERROR_NOT_EXIST				= 0x80310008, 
-CELL_LIBMIXER_ERROR_TYPE_MISMATCH			= 0x80310009, 
-CELL_LIBMIXER_ERROR_NOT_FOUND				= 0x8031000a, 
-
-//libsnd3 ERROR_CODES
-CELL_SND3_ERROR_PARAM					    = 0x80310301,
-CELL_SND3_ERROR_CREATE_MUTEX				= 0x80310302, 
-CELL_SND3_ERROR_SYNTH					    = 0x80310303, 
-CELL_SND3_ERROR_ALREADY					    = 0x80310304, 
-CELL_SND3_ERROR_NOTINIT						= 0x80310305,
-CELL_SND3_ERROR_SMFFULL					    = 0x80310306, 
-CELL_SND3_ERROR_HD3ID					    = 0x80310307,
-CELL_SND3_ERROR_SMF						    = 0x80310308,
-CELL_SND3_ERROR_SMFCTX					    = 0x80310309, 
-CELL_SND3_ERROR_FORMAT					    = 0x8031030a,
-CELL_SND3_ERROR_SMFID						= 0x8031030b, 
-CELL_SND3_ERROR_SOUNDDATAFULL				= 0x8031030c,
-CELL_SND3_ERROR_VOICENUM					= 0x8031030d, 
-CELL_SND3_ERROR_RESERVEDVOICE				= 0x8031030e, 
-CELL_SND3_ERROR_REQUESTQUEFULL			    = 0x8031030f, 
-CELL_SND3_ERROR_OUTPUTMODE				    = 0x80310310,
-
-//libsynt2 EROR_CODES
-CELL_SOUND_SYNTH2_ERROR_FATAL			    = 0x80310201,
-CELL_SOUND_SYNTH2_ERROR_INVALID_PARAMETER   = 0x80310202, 
-CELL_SOUND_SYNTH2_ERROR_ALREADY_INITIALIZED = 0x80310203, 
-};
-
-
-//libaudio datatyps
-struct CellAudioPortParam
-{ 
-u64 nChannel; 
-u64 nBlock; 
-u64 attr; 
-float level; 
-=======
 void cellAudio_init();
 Module cellAudio(0x0011, cellAudio_init);
 
@@ -135,68 +66,32 @@ struct CellAudioPortParam
 	u64 nBlock; 
 	u64 attr; 
 	float level; 
->>>>>>> 3dd9683b472b89358a697210798c89df5b0e5baa
 }; 
 
 struct CellAudioPortConfig
 { 
-<<<<<<< HEAD
-u32 readIndexAddr; 
-u32 status; 
-u64 nChannel; 
-u64 nBlock; 
-u32 portSize; 
-u32 portAddr; 
-=======
 	u32 readIndexAddr; 
 	u32 status; 
 	u64 nChannel; 
 	u64 nBlock; 
 	u32 portSize; 
 	u32 portAddr; 
->>>>>>> 3dd9683b472b89358a697210798c89df5b0e5baa
 };
 
 CellAudioPortParam current_AudioPortParam;
 CellAudioPortConfig current_AudioPortConfig;
 
 //libmixer datatypes
-<<<<<<< HEAD
-
-typedef void * CellAANHandle;
-
-
-struct CellSSPlayerConfig 
-{
-u32 channels; 
-u32 outputMode; 
-=======
 typedef void * CellAANHandle;
 
 struct CellSSPlayerConfig 
 {
 	u32 channels; 
 	u32 outputMode; 
->>>>>>> 3dd9683b472b89358a697210798c89df5b0e5baa
 }; 
 
 struct CellSSPlayerWaveParam 
 { 
-<<<<<<< HEAD
-void *addr; 
-int format; 
-u32 samples; 
-u32 loopStartOffset; 
-u32 startOffset; 
-};
-
-CellSSPlayerWaveParam current_SSPlayerWaveParam;
-
-struct CellSSPlayerCommonParam 
-{ 
-u32 loopMode; 
-u32 attackMode; 
-=======
 	void *addr;
 	int format; 
 	u32 samples; 
@@ -208,69 +103,33 @@ struct CellSSPlayerCommonParam
 { 
 	u32 loopMode; 
 	u32 attackMode; 
->>>>>>> 3dd9683b472b89358a697210798c89df5b0e5baa
 };
 
 struct CellSurMixerPosition 
 { 
-<<<<<<< HEAD
-float x; 
-float y; 
-float z;
-=======
 	float x; 
 	float y; 
 	float z;
->>>>>>> 3dd9683b472b89358a697210798c89df5b0e5baa
 };
 
 struct CellSSPlayerRuntimeInfo 
 { 
-<<<<<<< HEAD
-float level; 
-float speed; 
-CellSurMixerPosition position;
-=======
 	float level; 
 	float speed; 
 	CellSurMixerPosition position;
->>>>>>> 3dd9683b472b89358a697210798c89df5b0e5baa
 };
 
 struct CellSurMixerConfig 
 { 
-<<<<<<< HEAD
-s32 priority; 
-u32 chStrips1; 
-u32 chStrips2; 
-u32 chStrips6; 
-u32 chStrips8; 
-=======
 	s32 priority; 
 	u32 chStrips1; 
 	u32 chStrips2; 
 	u32 chStrips6; 
 	u32 chStrips8; 
->>>>>>> 3dd9683b472b89358a697210798c89df5b0e5baa
 };
 
 struct CellSurMixerChStripParam 
 { 
-<<<<<<< HEAD
-u32 param; 
-void *attribute; 
-int dBSwitch; 
-float floatVal; 
-int intVal; 
-};
-
-
-//libsnd3 datatypes
-
-struct CellSnd3DataCtx
-{ 
-s8 system;  //[CELL_SND3_DATA_CTX_SIZE], unknown identifier
-=======
 	u32 param; 
 	void *attribute; 
 	int dBSwitch; 
@@ -284,74 +143,37 @@ CellSSPlayerWaveParam current_SSPlayerWaveParam;
 struct CellSnd3DataCtx
 { 
 	s8 system;  //[CELL_SND3_DATA_CTX_SIZE], unknown identifier
->>>>>>> 3dd9683b472b89358a697210798c89df5b0e5baa
 }; 
 
 struct CellSnd3SmfCtx
 { 
-<<<<<<< HEAD
-s8 system;  //[CELL_SND3_SMF_CTX_SIZE],  unknown identifier
-=======
 	s8 system;  //[CELL_SND3_SMF_CTX_SIZE],  unknown identifier
->>>>>>> 3dd9683b472b89358a697210798c89df5b0e5baa
 };
 
 struct CellSnd3KeyOnParam
 { 
-<<<<<<< HEAD
-u8 vel; 
-u8 pan; 
-u8 panEx; 
-s32 addPitch; 
-=======
 	u8 vel; 
 	u8 pan; 
 	u8 panEx; 
 	s32 addPitch; 
->>>>>>> 3dd9683b472b89358a697210798c89df5b0e5baa
 };
 
 struct CellSnd3VoiceBitCtx
 { 
-<<<<<<< HEAD
-u32 core;  //[CELL_SND3_MAX_CORE],  unknown identifier
-=======
 	u32 core;  //[CELL_SND3_MAX_CORE],  unknown identifier
->>>>>>> 3dd9683b472b89358a697210798c89df5b0e5baa
 };
 
 struct CellSnd3RequestQueueCtx
 { 
-<<<<<<< HEAD
-void *frontQueue; 
-u32 frontQueueSize; 
-void *rearQueue; 
-u32 rearQueueSize; 
-=======
 	void *frontQueue; 
 	u32 frontQueueSize; 
 	void *rearQueue; 
 	u32 rearQueueSize; 
->>>>>>> 3dd9683b472b89358a697210798c89df5b0e5baa
 };
 
 //libsynt2 datatypes
 struct  CellSoundSynth2EffectAttr
 { 
-<<<<<<< HEAD
-u16 core; 
-u16 mode; 
-s16 depth_L; 
-s16 depth_R; 
-u16 delay; 
-u16 feedback; 
-};
-
-														//*libaudio functions*//
-
-bool g_is_audio_initialized = false;
-int cellAudioInit (void)
-=======
 	u16 core; 
 	u16 mode; 
 	s16 depth_L; 
@@ -364,7 +186,6 @@ int cellAudioInit (void)
 bool g_is_audio_initialized = false;
 
 int cellAudioInit()
->>>>>>> 3dd9683b472b89358a697210798c89df5b0e5baa
 {
 	UNIMPLEMENTED_FUNC(cellAudio);
 	if(g_is_audio_initialized) return CELL_AUDIO_ERROR_ALREADY_INIT;
@@ -372,11 +193,7 @@ int cellAudioInit()
 	return CELL_OK;
 }
 
-<<<<<<< HEAD
-s32 cellAudioQuit(void)
-=======
 int cellAudioQuit()
->>>>>>> 3dd9683b472b89358a697210798c89df5b0e5baa
 {
 	UNIMPLEMENTED_FUNC(cellAudio);
 	if (g_is_audio_initialized) return CELL_AUDIO_ERROR_NOT_INIT;
@@ -385,16 +202,10 @@ int cellAudioQuit()
 }
 
 // Audio Ports Setting/Operation Functions
-<<<<<<< HEAD
-
-bool g_is_audio_port_open = false;
-int cellAudioPortOpen () //CellAudioPortParam *audioParam, u32 *portNum
-=======
 bool g_is_audio_port_open = false;
 bool g_is_audio_port_start = false;
 
 int cellAudioPortOpen() //CellAudioPortParam *audioParam, u32 *portNum
->>>>>>> 3dd9683b472b89358a697210798c89df5b0e5baa
 {
 	UNIMPLEMENTED_FUNC(cellAudio);
 	if(g_is_audio_port_open) return CELL_AUDIO_ERROR_PORT_OPEN;
@@ -402,11 +213,7 @@ int cellAudioPortOpen() //CellAudioPortParam *audioParam, u32 *portNum
 	return CELL_OK;
 }
 
-<<<<<<< HEAD
-int cellAudioPortClose (u32 portNum)
-=======
 int cellAudioPortClose(u32 portNum)
->>>>>>> 3dd9683b472b89358a697210798c89df5b0e5baa
 {
 	UNIMPLEMENTED_FUNC(cellAudio);
 	if(g_is_audio_port_open) return CELL_AUDIO_ERROR_PORT_NOT_OPEN;
@@ -414,12 +221,7 @@ int cellAudioPortClose(u32 portNum)
 	return CELL_OK;
 }
 
-<<<<<<< HEAD
-bool g_is_audio_port_start = false;
-int cellAudioPortStart (u32 portNum)
-=======
 int cellAudioPortStart(u32 portNum)
->>>>>>> 3dd9683b472b89358a697210798c89df5b0e5baa
 {
 	UNIMPLEMENTED_FUNC(cellAudio);
 	if(g_is_audio_port_start) return CELL_AUDIO_ERROR_PORT_ALREADY_RUN;
@@ -427,11 +229,7 @@ int cellAudioPortStart(u32 portNum)
 	return CELL_OK;
 }
 
-<<<<<<< HEAD
-int cellAudioPortStop (u32 portNum)
-=======
 int cellAudioPortStop(u32 portNum)
->>>>>>> 3dd9683b472b89358a697210798c89df5b0e5baa
 {
 	UNIMPLEMENTED_FUNC(cellAudio);
 	if(g_is_audio_port_start) return CELL_AUDIO_ERROR_PORT_NOT_RUN;
@@ -439,174 +237,104 @@ int cellAudioPortStop(u32 portNum)
 	return CELL_OK;
 }
 
-<<<<<<< HEAD
-int cellAudioGetPortTimestamp () //u32 portNum, u64 tag, u64 *stamp
-=======
 int cellAudioGetPortTimestamp() //u32 portNum, u64 tag, u64 *stamp
->>>>>>> 3dd9683b472b89358a697210798c89df5b0e5baa
 {
 	UNIMPLEMENTED_FUNC(cellAudio);
 	return CELL_OK;
 }
 
-<<<<<<< HEAD
-int cellAudioGetPortConfig () //u32 portNum, CellAudioPortConfig *portConfig
-=======
 int cellAudioGetPortConfig() //u32 portNum, CellAudioPortConfig *portConfig
->>>>>>> 3dd9683b472b89358a697210798c89df5b0e5baa
 {
 	UNIMPLEMENTED_FUNC(cellAudio);
 	return CELL_OK;
 }
 
-<<<<<<< HEAD
-int cellAudioGetPortBlockTag () //u32 portNum, u64 blockNo, u64 *tag
-=======
 int cellAudioGetPortBlockTag() //u32 portNum, u64 blockNo, u64 *tag
->>>>>>> 3dd9683b472b89358a697210798c89df5b0e5baa
 {
 	UNIMPLEMENTED_FUNC (cellAudio);
 	return CELL_OK;
 }
 
-<<<<<<< HEAD
-int cellAudioSetPortLevel (u32 portNum, float level)
-=======
 int cellAudioSetPortLevel(u32 portNum, float level)
->>>>>>> 3dd9683b472b89358a697210798c89df5b0e5baa
 {
 	UNIMPLEMENTED_FUNC(cellAudio);
 	return CELL_OK;
 }
 
-<<<<<<< HEAD
-
-// Utility Functions  
-int cellAudioCreateNotifyEventQueue () //u32 *id, u64 *key
-=======
 // Utility Functions  
 int cellAudioCreateNotifyEventQueue() //u32 *id, u64 *key
->>>>>>> 3dd9683b472b89358a697210798c89df5b0e5baa
 {
 	UNIMPLEMENTED_FUNC(cellAudio);
 	return CELL_OK;
 }
 
-<<<<<<< HEAD
-int cellAudioCreateNotifyEventQueueEx (u32 *id, u64 *key, u32 iFlags)
-=======
 int cellAudioCreateNotifyEventQueueEx(u32 *id, u64 *key, u32 iFlags)
->>>>>>> 3dd9683b472b89358a697210798c89df5b0e5baa
 {
 	UNIMPLEMENTED_FUNC(cellAudio);
 	return CELL_OK;
 }
 
-<<<<<<< HEAD
-int cellAudioSetNotifyEventQueue (u64 key)
-=======
 int cellAudioSetNotifyEventQueue(u64 key)
->>>>>>> 3dd9683b472b89358a697210798c89df5b0e5baa
 {
 	UNIMPLEMENTED_FUNC(cellAudio);
 	return CELL_OK;
 }
 
-<<<<<<< HEAD
-int cellAudioSetNotifyEventQueueEx (u64 key, u32 iFlags)
-=======
 int cellAudioSetNotifyEventQueueEx(u64 key, u32 iFlags)
->>>>>>> 3dd9683b472b89358a697210798c89df5b0e5baa
 {
 	UNIMPLEMENTED_FUNC(cellAudio);
 	return CELL_OK;
 }
 
-<<<<<<< HEAD
-int cellAudioRemoveNotifyEventQueue (u64 key)
-=======
 int cellAudioRemoveNotifyEventQueue(u64 key)
->>>>>>> 3dd9683b472b89358a697210798c89df5b0e5baa
 {
 	UNIMPLEMENTED_FUNC(cellAudio);
 	return CELL_OK;
 }
 
-<<<<<<< HEAD
-int cellAudioRemoveNotifyEventQueueEx (u64 key, u32 iFlags)
-=======
 int cellAudioRemoveNotifyEventQueueEx(u64 key, u32 iFlags)
->>>>>>> 3dd9683b472b89358a697210798c89df5b0e5baa
 {
 	UNIMPLEMENTED_FUNC(cellAudio);
 	return CELL_OK;
 }
 
-<<<<<<< HEAD
-int cellAudioAddData () //u32 portNum, float *src, unsigned int samples, float volume
-=======
 int cellAudioAddData() //u32 portNum, float *src, unsigned int samples, float volume
->>>>>>> 3dd9683b472b89358a697210798c89df5b0e5baa
 {
 	UNIMPLEMENTED_FUNC(cellAudio);
 	return CELL_OK;
 }
 
-<<<<<<< HEAD
-int cellAudioAdd2chData () //u32 portNum, float *src, unsigned int samples, float volume
-=======
 int cellAudioAdd2chData() //u32 portNum, float *src, unsigned int samples, float volume
->>>>>>> 3dd9683b472b89358a697210798c89df5b0e5baa
 {
 	UNIMPLEMENTED_FUNC(cellAudio);
 	return CELL_OK;
 }
 
-<<<<<<< HEAD
-int cellAudioMiscSetAccessoryVolume (u32 devNum, float volume)
-=======
 int cellAudioMiscSetAccessoryVolume(u32 devNum, float volume)
->>>>>>> 3dd9683b472b89358a697210798c89df5b0e5baa
 {
 	UNIMPLEMENTED_FUNC(cellAudio);
 	return CELL_OK;
 }
 
-<<<<<<< HEAD
-int cellAudioSendAck (u64 data3)
-=======
 int cellAudioSendAck(u64 data3)
->>>>>>> 3dd9683b472b89358a697210798c89df5b0e5baa
 {
 	UNIMPLEMENTED_FUNC(cellAudio);
 	return CELL_OK;
 }
 
-<<<<<<< HEAD
-int cellAudioSetPersonalDevice (int iPersonalStream, int iDevice)
-=======
 int cellAudioSetPersonalDevice(int iPersonalStream, int iDevice)
->>>>>>> 3dd9683b472b89358a697210798c89df5b0e5baa
 {
 	UNIMPLEMENTED_FUNC(cellAudio);
 	return CELL_OK;
 }
 
-<<<<<<< HEAD
-int cellAudioUnsetPersonalDevice (int iPersonalStream)
-=======
 int cellAudioUnsetPersonalDevice(int iPersonalStream)
->>>>>>> 3dd9683b472b89358a697210798c89df5b0e5baa
 {
 	UNIMPLEMENTED_FUNC(cellAudio);
 	return CELL_OK;
 }
 
-<<<<<<< HEAD
-int cellAudioAdd6chData (u32 portNum, float *src, float volume)
-=======
 int cellAudioAdd6chData(u32 portNum, float *src, float volume)
->>>>>>> 3dd9683b472b89358a697210798c89df5b0e5baa
 {
 	UNIMPLEMENTED_FUNC(cellAudio);
 	return CELL_OK;
@@ -615,197 +343,116 @@ int cellAudioAdd6chData(u32 portNum, float *src, float volume)
 //Callback Functions 
 typedef int (*CellSurMixerNotifyCallbackFunction)(void *arg, u32 counter, u32 samples); //Currently unused.
 
-<<<<<<< HEAD
-
-
-                                             //*libmixer Functions, NON active in this moment*//
-
-
-int cellAANConnect (CellAANHandle receive, u32 receivePortNo, CellAANHandle source, u32 sourcePortNo)
-=======
 // libmixer Functions, NOT active in this moment
 int cellAANConnect(CellAANHandle receive, u32 receivePortNo, CellAANHandle source, u32 sourcePortNo)
->>>>>>> 3dd9683b472b89358a697210798c89df5b0e5baa
 {
 	UNIMPLEMENTED_FUNC(cellAudio);
 	return 0;
 }
 
-<<<<<<< HEAD
-int cellAANDisconnect (CellAANHandle receive, u32 receivePortNo, CellAANHandle source, u32 sourcePortNo)
-=======
 int cellAANDisconnect(CellAANHandle receive, u32 receivePortNo, CellAANHandle source, u32 sourcePortNo)
->>>>>>> 3dd9683b472b89358a697210798c89df5b0e5baa
 {
 	UNIMPLEMENTED_FUNC(cellAudio);
 	return 0;
 }
 
-<<<<<<< HEAD
-int cellAANAddData (CellAANHandle handle, u32 port, u32 offset, float *addr, u32 samples)
-=======
 int cellAANAddData(CellAANHandle handle, u32 port, u32 offset, float *addr, u32 samples)
->>>>>>> 3dd9683b472b89358a697210798c89df5b0e5baa
 {
 	UNIMPLEMENTED_FUNC(cellAudio);
 	return 0; 
 }
  
-<<<<<<< HEAD
-int cellSSPlayerCreate (CellAANHandle *handle, CellSSPlayerConfig *config)
-=======
 int cellSSPlayerCreate(CellAANHandle *handle, CellSSPlayerConfig *config)
->>>>>>> 3dd9683b472b89358a697210798c89df5b0e5baa
 {
 	UNIMPLEMENTED_FUNC(cellAudio);
 	return 0;
 }
 
-<<<<<<< HEAD
-int cellSSPlayerRemove (CellAANHandle handle)
-=======
 int cellSSPlayerRemove(CellAANHandle handle)
->>>>>>> 3dd9683b472b89358a697210798c89df5b0e5baa
 {
 	UNIMPLEMENTED_FUNC(cellAudio);
 	return 0;
 }
 
-<<<<<<< HEAD
-int cellSSPlayerSetWave () //CellAANHandle handle, CellSSPlayerWaveParam *waveInfo, CellSSPlayerCommonParam *commonInfo  //mem_class_t waveInfo
-=======
 int cellSSPlayerSetWave() //CellAANHandle handle, CellSSPlayerWaveParam *waveInfo, CellSSPlayerCommonParam *commonInfo  //mem_class_t waveInfo
->>>>>>> 3dd9683b472b89358a697210798c89df5b0e5baa
 {
 	UNIMPLEMENTED_FUNC(cellAudio);
 	return 0;
 }
 
-<<<<<<< HEAD
-int cellSSPlayerPlay () //CellAANHandle handle, CellSSPlayerRuntimeInfo *info
-=======
 int cellSSPlayerPlay() //CellAANHandle handle, CellSSPlayerRuntimeInfo *info
->>>>>>> 3dd9683b472b89358a697210798c89df5b0e5baa
 {
 	UNIMPLEMENTED_FUNC(cellAudio);
 	return 0;
 }
 
-<<<<<<< HEAD
-int cellSSPlayerStop () //CellAANHandle handle, u32 mode
-=======
 int cellSSPlayerStop() //CellAANHandle handle, u32 mode
->>>>>>> 3dd9683b472b89358a697210798c89df5b0e5baa
 {
 	UNIMPLEMENTED_FUNC(cellAudio);
 	return 0;
 }
 
-<<<<<<< HEAD
-int cellSSPlayerSetParam () //CellAANHandle handle, CellSSPlayerRuntimeInfo *info
-=======
 int cellSSPlayerSetParam() //CellAANHandle handle, CellSSPlayerRuntimeInfo *info
->>>>>>> 3dd9683b472b89358a697210798c89df5b0e5baa
 {
 	UNIMPLEMENTED_FUNC(cellAudio);
 	return 0;
 }
  
-<<<<<<< HEAD
-s32 cellSSPlayerGetState () //CellAANHandle handle
-=======
 s32 cellSSPlayerGetState() //CellAANHandle handle
->>>>>>> 3dd9683b472b89358a697210798c89df5b0e5baa
 {
 	UNIMPLEMENTED_FUNC(cellAudio);
 	return 0;
 }
 
-<<<<<<< HEAD
-int cellSurMixerCreate () //const CellSurMixerConfig *config
-=======
 int cellSurMixerCreate() //const CellSurMixerConfig *config
->>>>>>> 3dd9683b472b89358a697210798c89df5b0e5baa
 {
 	UNIMPLEMENTED_FUNC(cellAudio);
 	return 0;
 }
 
-<<<<<<< HEAD
-int cellSurMixerGetAANHandle () //CellAANHandle *handle
-=======
 int cellSurMixerGetAANHandle() //CellAANHandle *handle
->>>>>>> 3dd9683b472b89358a697210798c89df5b0e5baa
 {
 	UNIMPLEMENTED_FUNC(cellAudio);
 	return 0;
 }
 
-<<<<<<< HEAD
-int cellSurMixerChStripGetAANPortNo () //u32 *port, u32 type, u32 index
-=======
 int cellSurMixerChStripGetAANPortNo() //u32 *port, u32 type, u32 index
->>>>>>> 3dd9683b472b89358a697210798c89df5b0e5baa
 {
 	UNIMPLEMENTED_FUNC(cellAudio);
 	return 0;
 }
 
-<<<<<<< HEAD
-int cellSurMixerSetNotifyCallback () //CellSurMixerNotifyCallbackFunction callback, void *arg
-=======
 int cellSurMixerSetNotifyCallback() //CellSurMixerNotifyCallbackFunction callback, void *arg
->>>>>>> 3dd9683b472b89358a697210798c89df5b0e5baa
 {
 	UNIMPLEMENTED_FUNC(cellAudio);
 	return 0;
 }
 
-<<<<<<< HEAD
-int cellSurMixerRemoveNotifyCallback () //CellSurMixerNotifyCallbackFunction callback
-=======
 int cellSurMixerRemoveNotifyCallback() //CellSurMixerNotifyCallbackFunction callback
->>>>>>> 3dd9683b472b89358a697210798c89df5b0e5baa
 {
 	UNIMPLEMENTED_FUNC(cellAudio);
 	return 0;
 }
 
-<<<<<<< HEAD
-int cellSurMixerStart(void)
-=======
 int cellSurMixerStart()
->>>>>>> 3dd9683b472b89358a697210798c89df5b0e5baa
 {
 	UNIMPLEMENTED_FUNC(cellAudio);
 	return 0;
 }
 
-<<<<<<< HEAD
-int cellSurMixerSurBusAddData () //u32 busNo, u32 offset, float *addr, u32 samples
-=======
 int cellSurMixerSurBusAddData() //u32 busNo, u32 offset, float *addr, u32 samples
->>>>>>> 3dd9683b472b89358a697210798c89df5b0e5baa
 {
 	UNIMPLEMENTED_FUNC(cellAudio);
 	return 0;
 }
 
-<<<<<<< HEAD
-int cellSurMixerSetParameter () //u32 param, float value
-=======
 int cellSurMixerSetParameter() //u32 param, float value
->>>>>>> 3dd9683b472b89358a697210798c89df5b0e5baa
 {
 	UNIMPLEMENTED_FUNC(cellAudio);
 	return 0;
 }
 
-<<<<<<< HEAD
-int cellSurMixerChStripSetParameter () //u32 type, u32 index, CellSurMixerChStripParam *param
-=======
 int cellSurMixerChStripSetParameter() //u32 type, u32 index, CellSurMixerChStripParam *param
->>>>>>> 3dd9683b472b89358a697210798c89df5b0e5baa
 {
 	UNIMPLEMENTED_FUNC(cellAudio);
 	return 0;
@@ -817,210 +464,127 @@ int cellSurMixerPause() //u32 switch
 	return 0;
 }
 
-<<<<<<< HEAD
-int cellSurMixerGetCurrentBlockTag () //u64 *tag
-=======
 int cellSurMixerGetCurrentBlockTag() //u64 *tag
->>>>>>> 3dd9683b472b89358a697210798c89df5b0e5baa
 {
 	UNIMPLEMENTED_FUNC(cellAudio);
 	return 0;
 }
 
-<<<<<<< HEAD
-int cellSurMixerGetTimestamp () //u64 tag, u64 *stamp
-=======
 int cellSurMixerGetTimestamp() //u64 tag, u64 *stamp
->>>>>>> 3dd9683b472b89358a697210798c89df5b0e5baa
 {
 	UNIMPLEMENTED_FUNC(cellAudio);
 	return 0;
 }
 
-<<<<<<< HEAD
-void cellSurMixerBeep (); //void *arg
-
-float cellSurMixerUtilGetLevelFromDB () //float dB
-=======
 void cellSurMixerBeep(); //void *arg
 
 float cellSurMixerUtilGetLevelFromDB() //float dB
->>>>>>> 3dd9683b472b89358a697210798c89df5b0e5baa
 {
 	UNIMPLEMENTED_FUNC(cellAudio);
 	return CELL_OK; //it's NOT real value
 	//TODO;
 }
 
-<<<<<<< HEAD
-float cellSurMixerUtilGetLevelFromDBIndex () //int index
-=======
 float cellSurMixerUtilGetLevelFromDBIndex() //int index
->>>>>>> 3dd9683b472b89358a697210798c89df5b0e5baa
 {
 	UNIMPLEMENTED_FUNC(cellAudio);
 	return CELL_OK; //it's NOT real value
 	//TODO;
 }
 
-<<<<<<< HEAD
-float cellSurMixerUtilNoteToRatio () //unsigned char refNote, unsigned char note
-=======
 float cellSurMixerUtilNoteToRatio() //unsigned char refNote, unsigned char note
->>>>>>> 3dd9683b472b89358a697210798c89df5b0e5baa
 {
 	UNIMPLEMENTED_FUNC(cellAudio);
 	return CELL_OK; //it's NOT real value
 	//TODO
 }
 
-<<<<<<< HEAD
-int cellSurMixerFinalize(void); //Currently unused. Returns 0 (in the current release).
-
-
-											//*libsnd3 Functions, NON active in this moment*//
-
-s32 cellSnd3Init () //u32 maxVoice, u32 samples, CellSnd3RequestQueueCtx *queue
-=======
 int cellSurMixerFinalize(); //Currently unused. Returns 0 (in the current release).
 
 //*libsnd3 Functions, NOT active in this moment
 s32 cellSnd3Init() //u32 maxVoice, u32 samples, CellSnd3RequestQueueCtx *queue
->>>>>>> 3dd9683b472b89358a697210798c89df5b0e5baa
 {
 	UNIMPLEMENTED_FUNC(cellAudio);
 	return CELL_OK;
 }
 
-<<<<<<< HEAD
-s32 cellSnd3Exit (void)
-=======
 s32 cellSnd3Exit()
->>>>>>> 3dd9683b472b89358a697210798c89df5b0e5baa
 {
 	UNIMPLEMENTED_FUNC(cellAudio);
 	return CELL_OK;
 }
 
-<<<<<<< HEAD
-s32 cellSnd3SetOutputMode () //u32 mode
-=======
 s32 cellSnd3SetOutputMode() //u32 mode
->>>>>>> 3dd9683b472b89358a697210798c89df5b0e5baa
 {
 	UNIMPLEMENTED_FUNC(cellAudio);
 	return CELL_OK;
 }
 
-<<<<<<< HEAD
-s32 cellSnd3Synthesis () //float *pOutL, float *pOutR
-=======
 s32 cellSnd3Synthesis() //float *pOutL, float *pOutR
->>>>>>> 3dd9683b472b89358a697210798c89df5b0e5baa
 {
 	UNIMPLEMENTED_FUNC(cellAudio);
 	return CELL_OK;
 }
 
-<<<<<<< HEAD
-s32 cellSnd3SynthesisEx () //float *pOutL, float *pOutR, float *pOutRL, float *pOutRR
-=======
 s32 cellSnd3SynthesisEx() //float *pOutL, float *pOutR, float *pOutRL, float *pOutRR
->>>>>>> 3dd9683b472b89358a697210798c89df5b0e5baa
 {
 	UNIMPLEMENTED_FUNC(cellAudio);
 	return CELL_OK;
 }
 
-<<<<<<< HEAD
-s32 cellSnd3VoiceSetReserveMode () //u32 voiceNum, u32 reserveMode
-=======
 s32 cellSnd3VoiceSetReserveMode() //u32 voiceNum, u32 reserveMode
->>>>>>> 3dd9683b472b89358a697210798c89df5b0e5baa
 {
 	UNIMPLEMENTED_FUNC(cellAudio);
 	return CELL_OK;
 }
 
-<<<<<<< HEAD
-s32 cellSnd3BindSoundData () //CellSnd3DataCtx *snd3Ctx, void *hd3, u32 synthMemOffset
-=======
 s32 cellSnd3BindSoundData() //CellSnd3DataCtx *snd3Ctx, void *hd3, u32 synthMemOffset
->>>>>>> 3dd9683b472b89358a697210798c89df5b0e5baa
 {
 	UNIMPLEMENTED_FUNC(cellAudio);
 	return CELL_OK;
 }
 
-<<<<<<< HEAD
-s32 cellSnd3UnbindSoundData (u32 hd3ID)
-=======
 s32 cellSnd3UnbindSoundData(u32 hd3ID)
->>>>>>> 3dd9683b472b89358a697210798c89df5b0e5baa
 {
 	UNIMPLEMENTED_FUNC(cellAudio);
 	return CELL_OK;
 }
 
-<<<<<<< HEAD
-s32 cellSnd3NoteOnByTone () //u32 hd3ID, u32 toneIndex, u32 note, u32 keyOnID, CellSnd3KeyOnParam *keyOnParam
-=======
 s32 cellSnd3NoteOnByTone() //u32 hd3ID, u32 toneIndex, u32 note, u32 keyOnID, CellSnd3KeyOnParam *keyOnParam
->>>>>>> 3dd9683b472b89358a697210798c89df5b0e5baa
 {
 	UNIMPLEMENTED_FUNC(cellAudio);
 	return CELL_OK; //it's NOT real value
 	//TODO
 }
 
-<<<<<<< HEAD
-s32 cellSnd3KeyOnByTone () //u32 hd3ID, u32 toneIndex,  u32 pitch,u32 keyOnID,CellSnd3KeyOnParam *keyOnParam
-=======
 s32 cellSnd3KeyOnByTone() //u32 hd3ID, u32 toneIndex,  u32 pitch,u32 keyOnID,CellSnd3KeyOnParam *keyOnParam
->>>>>>> 3dd9683b472b89358a697210798c89df5b0e5baa
 {
 	UNIMPLEMENTED_FUNC(cellAudio);
 	return CELL_OK; //it's NOT real value
 	//TODO
 }
 
-<<<<<<< HEAD
-s32 cellSnd3VoiceNoteOnByTone () //u32 hd3ID, u32 voiceNum, u32 toneIndex, u32 note, u32 keyOnID, CellSnd3KeyOnParam *keyOnParam
-=======
 s32 cellSnd3VoiceNoteOnByTone() //u32 hd3ID, u32 voiceNum, u32 toneIndex, u32 note, u32 keyOnID, CellSnd3KeyOnParam *keyOnParam
->>>>>>> 3dd9683b472b89358a697210798c89df5b0e5baa
 {
 	UNIMPLEMENTED_FUNC(cellAudio);
 	return CELL_OK; //it's NOT real value
 	//TODO
 }
 
-<<<<<<< HEAD
-s32 cellSnd3VoiceKeyOnByTone () //u32 hd3ID, u32 voiceNum, u32 toneIndex, u32 pitch, u32 keyOnID, CellSnd3KeyOnParam *keyOnParam
-=======
 s32 cellSnd3VoiceKeyOnByTone() //u32 hd3ID, u32 voiceNum, u32 toneIndex, u32 pitch, u32 keyOnID, CellSnd3KeyOnParam *keyOnParam
->>>>>>> 3dd9683b472b89358a697210798c89df5b0e5baa
 {
 	UNIMPLEMENTED_FUNC(cellAudio);
 	return CELL_OK; //it's NOT real value
 	//TODO
 }
 
-<<<<<<< HEAD
-s32 cellSnd3VoiceSetSustainHold (u32 voiceNum, u32 sustainHold)
-=======
 s32 cellSnd3VoiceSetSustainHold(u32 voiceNum, u32 sustainHold)
->>>>>>> 3dd9683b472b89358a697210798c89df5b0e5baa
 {
 	UNIMPLEMENTED_FUNC(cellAudio);
 	return CELL_OK;
 }
 
-<<<<<<< HEAD
-s32 cellSnd3VoiceKeyOff (u32 voiceNum)
-=======
 s32 cellSnd3VoiceKeyOff(u32 voiceNum)
->>>>>>> 3dd9683b472b89358a697210798c89df5b0e5baa
 {
 	UNIMPLEMENTED_FUNC(cellAudio);
 	return CELL_OK;
@@ -1032,361 +596,221 @@ s32 cellSnd3VoiceSetPitch(u32 voiceNum, s32 addPitch)
 	return CELL_OK;
 }
 
-<<<<<<< HEAD
-s32 cellSnd3VoiceSetVelocity (u32 voiceNum, u32 velocity)
-=======
 s32 cellSnd3VoiceSetVelocity(u32 voiceNum, u32 velocity)
->>>>>>> 3dd9683b472b89358a697210798c89df5b0e5baa
 {
 	UNIMPLEMENTED_FUNC(cellAudio);
 	return CELL_OK;
 }
 
-<<<<<<< HEAD
-s32 cellSnd3VoiceSetPanpot (u32 voiceNum, u32 panpot)
-=======
 s32 cellSnd3VoiceSetPanpot(u32 voiceNum, u32 panpot)
->>>>>>> 3dd9683b472b89358a697210798c89df5b0e5baa
 {
 	UNIMPLEMENTED_FUNC(cellAudio);
 	return CELL_OK;
 }
 
-<<<<<<< HEAD
-s32 cellSnd3VoiceSetPanpotEx (u32 voiceNum, u32 panpotEx)
-=======
 s32 cellSnd3VoiceSetPanpotEx(u32 voiceNum, u32 panpotEx)
->>>>>>> 3dd9683b472b89358a697210798c89df5b0e5baa
 {
 	UNIMPLEMENTED_FUNC(cellAudio);
 	return CELL_OK;
 }
 
-<<<<<<< HEAD
-s32 cellSnd3VoiceSetPitchBend (u32 voiceNum, u32 bendValue)
-=======
 s32 cellSnd3VoiceSetPitchBend(u32 voiceNum, u32 bendValue)
->>>>>>> 3dd9683b472b89358a697210798c89df5b0e5baa
 {
 	UNIMPLEMENTED_FUNC(cellAudio);
 	return CELL_OK;
 }
 
-<<<<<<< HEAD
-s32 cellSnd3VoiceAllKeyOff (void)
-=======
 s32 cellSnd3VoiceAllKeyOff()
->>>>>>> 3dd9683b472b89358a697210798c89df5b0e5baa
 {
 	UNIMPLEMENTED_FUNC(cellAudio);
 	return CELL_OK;
 }
 
-<<<<<<< HEAD
-s32 cellSnd3VoiceGetEnvelope (u32 voiceNum)
-=======
 s32 cellSnd3VoiceGetEnvelope(u32 voiceNum)
->>>>>>> 3dd9683b472b89358a697210798c89df5b0e5baa
 {
 	UNIMPLEMENTED_FUNC(cellAudio);
 	return CELL_OK;
 }
 
-<<<<<<< HEAD
-s32 cellSnd3VoiceGetStatus ()  //u32 voiceNum
-=======
 s32 cellSnd3VoiceGetStatus()  //u32 voiceNum
->>>>>>> 3dd9683b472b89358a697210798c89df5b0e5baa
 {
 	UNIMPLEMENTED_FUNC(cellAudio);
 	return CELL_OK; //it's NOT real value
 	//TODO
 }
 
-<<<<<<< HEAD
-u32 cellSnd3KeyOffByID (u32 keyOnID)
-=======
 u32 cellSnd3KeyOffByID(u32 keyOnID)
->>>>>>> 3dd9683b472b89358a697210798c89df5b0e5baa
 {
 	UNIMPLEMENTED_FUNC(cellAudio);
 	return CELL_OK;
 }
 
-<<<<<<< HEAD
-s32 cellSnd3GetVoice () //u32 midiChannel, u32 keyOnID, CellSnd3VoiceBitCtx *voiceBit
-=======
 s32 cellSnd3GetVoice() //u32 midiChannel, u32 keyOnID, CellSnd3VoiceBitCtx *voiceBit
->>>>>>> 3dd9683b472b89358a697210798c89df5b0e5baa
 {
 	UNIMPLEMENTED_FUNC(cellAudio);
 	return CELL_OK;
 }
 
-<<<<<<< HEAD
-s32 cellSnd3GetVoiceByID () //u32 keyOnID, CellSnd3VoiceBitCtx *voiceBit
-=======
 s32 cellSnd3GetVoiceByID() //u32 keyOnID, CellSnd3VoiceBitCtx *voiceBit
->>>>>>> 3dd9683b472b89358a697210798c89df5b0e5baa
 {
 	UNIMPLEMENTED_FUNC(cellAudio);
 	return CELL_OK;
 }
 
-<<<<<<< HEAD
-s32 cellSnd3NoteOn () //u32 hd3ID, u32 midiChannel, u32 midiProgram, u32 midiNote, u32 sustain,CellSnd3KeyOnParam *keyOnParam, u32 keyOnID
-=======
 s32 cellSnd3NoteOn() //u32 hd3ID, u32 midiChannel, u32 midiProgram, u32 midiNote, u32 sustain,CellSnd3KeyOnParam *keyOnParam, u32 keyOnID
->>>>>>> 3dd9683b472b89358a697210798c89df5b0e5baa
 {
 	UNIMPLEMENTED_FUNC(cellAudio);
 	return CELL_OK;
 }
 
-<<<<<<< HEAD
-s32 cellSnd3NoteOff (u32 midiChannel, u32 midiNote, u32 keyOnID)
-=======
 s32 cellSnd3NoteOff(u32 midiChannel, u32 midiNote, u32 keyOnID)
->>>>>>> 3dd9683b472b89358a697210798c89df5b0e5baa
 {
 	UNIMPLEMENTED_FUNC(cellAudio);
 	return CELL_OK;
 }
 
-<<<<<<< HEAD
-s32 cellSnd3SetSustainHold (u32 midiChannel, u32 sustainHold, u32 ID)
-=======
 s32 cellSnd3SetSustainHold(u32 midiChannel, u32 sustainHold, u32 ID)
->>>>>>> 3dd9683b472b89358a697210798c89df5b0e5baa
 {
 	UNIMPLEMENTED_FUNC(cellAudio);
 	return CELL_OK;
 }
 
-<<<<<<< HEAD
-s32 cellSnd3SetEffectType (u16 effectType, s16 returnVol, u16 delay, u16 feedback)
-=======
 s32 cellSnd3SetEffectType(u16 effectType, s16 returnVol, u16 delay, u16 feedback)
->>>>>>> 3dd9683b472b89358a697210798c89df5b0e5baa
 {
 	UNIMPLEMENTED_FUNC(cellAudio);
 	return CELL_OK;
 }
 
-<<<<<<< HEAD
-u16 cellSnd3Note2Pitch ()  //u16 center_note, u16 center_fine, u16 note, s16 fine
-=======
 u16 cellSnd3Note2Pitch() //u16 center_note, u16 center_fine, u16 note, s16 fine
->>>>>>> 3dd9683b472b89358a697210798c89df5b0e5baa
 {
 	UNIMPLEMENTED_FUNC(cellAudio);
 	return CELL_OK; //it's NOT real value
 	//TODO
 }
 
-<<<<<<< HEAD
-u16 cellSnd3Pitch2Note ()  //u16 center_note, u16 center_fine, u16 pitch
-=======
 u16 cellSnd3Pitch2Note() //u16 center_note, u16 center_fine, u16 pitch
->>>>>>> 3dd9683b472b89358a697210798c89df5b0e5baa
 {
 	UNIMPLEMENTED_FUNC(cellAudio);
 	return CELL_OK; //it's NOT real value
 	//TODO
 }
 
-<<<<<<< HEAD
-s32 cellSnd3SMFBind ()  //CellSnd3SmfCtx *smfCtx, void *smf, u32 hd3ID
-=======
 s32 cellSnd3SMFBind() //CellSnd3SmfCtx *smfCtx, void *smf, u32 hd3ID
->>>>>>> 3dd9683b472b89358a697210798c89df5b0e5baa
 {
 	UNIMPLEMENTED_FUNC(cellAudio);
 	return CELL_OK; //it's NOT real value
 	//TODO
 }
 
-<<<<<<< HEAD
-s32 cellSnd3SMFUnbind () //u32 smfID
-=======
 s32 cellSnd3SMFUnbind() //u32 smfID
->>>>>>> 3dd9683b472b89358a697210798c89df5b0e5baa
 {
 	UNIMPLEMENTED_FUNC(cellAudio);
 	return CELL_OK; //it's NOT real value
 	//TODO
 }
 
-<<<<<<< HEAD
-s32 cellSnd3SMFPlay (u32 smfID, u32 playVelocity, u32 playPan, u32 playCount)
-=======
 s32 cellSnd3SMFPlay(u32 smfID, u32 playVelocity, u32 playPan, u32 playCount)
->>>>>>> 3dd9683b472b89358a697210798c89df5b0e5baa
 {
 	UNIMPLEMENTED_FUNC(cellAudio);
 	return CELL_OK;
 }
 
-<<<<<<< HEAD
-s32 cellSnd3SMFPlayEx (u32 smfID, u32 playVelocity, u32 playPan, u32 playPanEx, u32 playCount)
-=======
 s32 cellSnd3SMFPlayEx(u32 smfID, u32 playVelocity, u32 playPan, u32 playPanEx, u32 playCount)
->>>>>>> 3dd9683b472b89358a697210798c89df5b0e5baa
 {
 	UNIMPLEMENTED_FUNC(cellAudio);
 	return CELL_OK;
 }
 
-<<<<<<< HEAD
-s32 cellSnd3SMFPause (u32 smfID)
-=======
 s32 cellSnd3SMFPause(u32 smfID)
->>>>>>> 3dd9683b472b89358a697210798c89df5b0e5baa
 {
 	UNIMPLEMENTED_FUNC(cellAudio);
 	return CELL_OK;
 }
 
-<<<<<<< HEAD
-s32 cellSnd3SMFResume (u32 smfID)
-=======
 s32 cellSnd3SMFResume(u32 smfID)
->>>>>>> 3dd9683b472b89358a697210798c89df5b0e5baa
 {
 	UNIMPLEMENTED_FUNC(cellAudio);
 	return CELL_OK;
 }
 
-<<<<<<< HEAD
-s32 cellSnd3SMFStop (u32 smfID)
-=======
 s32 cellSnd3SMFStop(u32 smfID)
->>>>>>> 3dd9683b472b89358a697210798c89df5b0e5baa
 {
 	UNIMPLEMENTED_FUNC(cellAudio);
 	return CELL_OK;
 }
 
-<<<<<<< HEAD
-s32 cellSnd3SMFAddTempo (u32 smfID, s32 addTempo)
-=======
 s32 cellSnd3SMFAddTempo(u32 smfID, s32 addTempo)
->>>>>>> 3dd9683b472b89358a697210798c89df5b0e5baa
 {
 	UNIMPLEMENTED_FUNC(cellAudio);
 	return CELL_OK;
 }
 
-<<<<<<< HEAD
-s32 cellSnd3SMFGetTempo () //u32 smfID
-=======
 s32 cellSnd3SMFGetTempo() //u32 smfID
->>>>>>> 3dd9683b472b89358a697210798c89df5b0e5baa
 {
 	UNIMPLEMENTED_FUNC(cellAudio);
 	return CELL_OK; //it's NOT real value
 	//TODO
 }
 
-<<<<<<< HEAD
-s32 cellSnd3SMFSetPlayVelocity (u32 smfID, u32 playVelocity)
-=======
 s32 cellSnd3SMFSetPlayVelocity(u32 smfID, u32 playVelocity)
->>>>>>> 3dd9683b472b89358a697210798c89df5b0e5baa
 {
 	UNIMPLEMENTED_FUNC(cellAudio);
 	return CELL_OK;
 }
 
-<<<<<<< HEAD
-s32 cellSnd3SMFGetPlayVelocity ()  //u32 smfID
-=======
 s32 cellSnd3SMFGetPlayVelocity()  //u32 smfID
->>>>>>> 3dd9683b472b89358a697210798c89df5b0e5baa
 {
 	UNIMPLEMENTED_FUNC(cellAudio);
 	return CELL_OK; //it's NOT real value
 	//TODO
 }
 
-<<<<<<< HEAD
-s32 cellSnd3SMFSetPlayPanpot (u32 smfID, u32 playPanpot)
-=======
 s32 cellSnd3SMFSetPlayPanpot(u32 smfID, u32 playPanpot)
->>>>>>> 3dd9683b472b89358a697210798c89df5b0e5baa
 {
 	UNIMPLEMENTED_FUNC(cellAudio);
 	return CELL_OK;
 }
 
-<<<<<<< HEAD
-s32 cellSnd3SMFSetPlayPanpotEx (u32 smfID, u32 playPanpotEx)
-=======
 s32 cellSnd3SMFSetPlayPanpotEx(u32 smfID, u32 playPanpotEx)
->>>>>>> 3dd9683b472b89358a697210798c89df5b0e5baa
 {
 	UNIMPLEMENTED_FUNC(cellAudio);
 	return CELL_OK;
 }
 
-<<<<<<< HEAD
-s32 cellSnd3SMFGetPlayPanpot () //u32 smfID
-=======
 s32 cellSnd3SMFGetPlayPanpot() //u32 smfID
->>>>>>> 3dd9683b472b89358a697210798c89df5b0e5baa
 {
 	UNIMPLEMENTED_FUNC(cellAudio);
 	return CELL_OK; //it's NOT real value
 	//TODO
 }
 
-<<<<<<< HEAD
-s32 cellSnd3SMFGetPlayPanpotEx () //u32 smfID
-=======
 s32 cellSnd3SMFGetPlayPanpotEx() //u32 smfID
->>>>>>> 3dd9683b472b89358a697210798c89df5b0e5baa
 {
 	UNIMPLEMENTED_FUNC(cellAudio);
 	return CELL_OK; //it's NOT real value
 	//TODO
 }
 
-<<<<<<< HEAD
-s32 cellSnd3SMFGetPlayStatus ()  //u32 smfID
-=======
 s32 cellSnd3SMFGetPlayStatus()  //u32 smfID
->>>>>>> 3dd9683b472b89358a697210798c89df5b0e5baa
 {
 	UNIMPLEMENTED_FUNC(cellAudio);
 	return CELL_OK; //it's NOT real value
 	//TODO
 }
 
-<<<<<<< HEAD
-s32 cellSnd3SMFSetPlayChannel (u32 smfID, u32 playChannelBit)
-=======
 s32 cellSnd3SMFSetPlayChannel(u32 smfID, u32 playChannelBit)
->>>>>>> 3dd9683b472b89358a697210798c89df5b0e5baa
 {
 	UNIMPLEMENTED_FUNC(cellAudio);
 	return CELL_OK;
 }
 
-<<<<<<< HEAD
-s32 cellSnd3SMFGetPlayChannel () //u32 smfID, u32 *playChannelBit
-=======
 s32 cellSnd3SMFGetPlayChannel() //u32 smfID, u32 *playChannelBit
->>>>>>> 3dd9683b472b89358a697210798c89df5b0e5baa
 {
 	UNIMPLEMENTED_FUNC(cellAudio);
 	return CELL_OK;
 }
 
-<<<<<<< HEAD
-s32 cellSnd3SMFGetKeyOnID () //u32 smfID, u32 midiChannel, u32 *keyOnID
-=======
 s32 cellSnd3SMFGetKeyOnID() //u32 smfID, u32 midiChannel, u32 *keyOnID
->>>>>>> 3dd9683b472b89358a697210798c89df5b0e5baa
 {
 	UNIMPLEMENTED_FUNC(cellAudio);
 	return CELL_OK;
@@ -1394,11 +818,7 @@ s32 cellSnd3SMFGetKeyOnID() //u32 smfID, u32 midiChannel, u32 *keyOnID
 
                                            //*libsynth2 Functions, NON active in this moment*//
 
-<<<<<<< HEAD
-s32 cellSoundSynth2Config (s16 param, s32 value)
-=======
 s32 cellSoundSynth2Config(s16 param, s32 value)
->>>>>>> 3dd9683b472b89358a697210798c89df5b0e5baa
 {
 	UNIMPLEMENTED_FUNC(cellAudio);
 	return 0;
@@ -1410,145 +830,89 @@ s32 cellSoundSynth2Init( s16 flag)
 	return 0;
 }
 
-<<<<<<< HEAD
-s32 cellSoundSynth2Exit(void)
-=======
 s32 cellSoundSynth2Exit()
->>>>>>> 3dd9683b472b89358a697210798c89df5b0e5baa
 {
 	UNIMPLEMENTED_FUNC(cellAudio);
 	return 0;
 }
 
-<<<<<<< HEAD
-void cellSoundSynth2SetParam (u16 register, u16 value)
-=======
 void cellSoundSynth2SetParam(u16 register, u16 value)
->>>>>>> 3dd9683b472b89358a697210798c89df5b0e5baa
 {
 	UNIMPLEMENTED_FUNC(cellAudio);
 	//TODO
 }
 
-<<<<<<< HEAD
-u16 cellSoundSynth2GetParam () //u16 register
-=======
 u16 cellSoundSynth2GetParam() //u16 register
->>>>>>> 3dd9683b472b89358a697210798c89df5b0e5baa
 {
 	UNIMPLEMENTED_FUNC(cellAudio);
 	return CELL_OK; //it's NOT real value
 	//TODO
 }
 
-<<<<<<< HEAD
-void cellSoundSynth2SetSwitch (u16 register, u32 value)
-=======
 void cellSoundSynth2SetSwitch(u16 register, u32 value)
->>>>>>> 3dd9683b472b89358a697210798c89df5b0e5baa
 {
 	UNIMPLEMENTED_FUNC(cellAudio);
 	//TODO
 }
 
-<<<<<<< HEAD
-u32 cellSoundSynth2GetSwitch () //u16 register
-=======
 u32 cellSoundSynth2GetSwitch() //u16 register
->>>>>>> 3dd9683b472b89358a697210798c89df5b0e5baa
 {
 	UNIMPLEMENTED_FUNC(cellAudio);
 	return CELL_OK; //it's NOT real value
 	//TODO
 }
 
-<<<<<<< HEAD
-u32 cellSoundSynth2SetAddr (u16 register, u32 value)
-=======
 u32 cellSoundSynth2SetAddr(u16 register, u32 value)
->>>>>>> 3dd9683b472b89358a697210798c89df5b0e5baa
 {
 	UNIMPLEMENTED_FUNC(cellAudio);
 	return 0;
 }
 
-<<<<<<< HEAD
-u32 cellSoundSynth2GetAddr () //u16 register
-=======
 u32 cellSoundSynth2GetAddr() //u16 register
->>>>>>> 3dd9683b472b89358a697210798c89df5b0e5baa
 {
 	UNIMPLEMENTED_FUNC(cellAudio);
 	return CELL_OK; //it's NOT real value
 	//TODO
 }
 
-<<<<<<< HEAD
-s32 cellSoundSynth2SetEffectAttr () //s16 bus, CellSoundSynth2EffectAttr *attr
-=======
 s32 cellSoundSynth2SetEffectAttr() //s16 bus, CellSoundSynth2EffectAttr *attr
->>>>>>> 3dd9683b472b89358a697210798c89df5b0e5baa
 {
 	UNIMPLEMENTED_FUNC(cellAudio);
 	return 0;
 }
 
-<<<<<<< HEAD
-s32 cellSoundSynth2SetEffectMode () //s16 bus, CellSoundSynth2EffectAttr *attr
-=======
 s32 cellSoundSynth2SetEffectMode() //s16 bus, CellSoundSynth2EffectAttr *attr
->>>>>>> 3dd9683b472b89358a697210798c89df5b0e5baa
 {
 	UNIMPLEMENTED_FUNC(cellAudio);
 	return 0;
 }
 
-<<<<<<< HEAD
-void cellSoundSynth2SetCoreAttr (u16 entry, u16 value) 
-=======
 void cellSoundSynth2SetCoreAttr(u16 entry, u16 value) 
->>>>>>> 3dd9683b472b89358a697210798c89df5b0e5baa
 {
 	UNIMPLEMENTED_FUNC(cellAudio);
 	//TODO
 }
 
-<<<<<<< HEAD
-s32 cellSoundSynth2Generate () //u16 samples, float *left_buffer, float *right_buffer, float *left_rear, float *right_rear
-=======
 s32 cellSoundSynth2Generate() //u16 samples, float *left_buffer, float *right_buffer, float *left_rear, float *right_rear
->>>>>>> 3dd9683b472b89358a697210798c89df5b0e5baa
 {
 	UNIMPLEMENTED_FUNC(cellAudio);
 	return 0;
 }
 
-<<<<<<< HEAD
-s32 cellSoundSynth2VoiceTrans () //s16 channel, u16 mode, u8 *m_addr, u32 s_addr, u32 size
-=======
 s32 cellSoundSynth2VoiceTrans() //s16 channel, u16 mode, u8 *m_addr, u32 s_addr, u32 size
->>>>>>> 3dd9683b472b89358a697210798c89df5b0e5baa
 {
 	UNIMPLEMENTED_FUNC(cellAudio);
 	return 0;
 }
 
-<<<<<<< HEAD
-u16 cellSoundSynth2Note2Pitch () //u16 center_note, u16 center_fine, u16 note, s16 fine
-=======
 u16 cellSoundSynth2Note2Pitch() //u16 center_note, u16 center_fine, u16 note, s16 fine
->>>>>>> 3dd9683b472b89358a697210798c89df5b0e5baa
 {
 	UNIMPLEMENTED_FUNC(cellAudio);
 	return CELL_OK; //it's NOT real value
 	//TODO
 }
 
-<<<<<<< HEAD
-u16 cellSoundSynth2Pitch2Note () //u16 center_note, u16 center_fine, u16 pitch
-=======
 u16 cellSoundSynth2Pitch2Note() //u16 center_note, u16 center_fine, u16 pitch
->>>>>>> 3dd9683b472b89358a697210798c89df5b0e5baa
 {
 	UNIMPLEMENTED_FUNC(cellAudio);
 	return CELL_OK; //it's NOT real value
@@ -1556,27 +920,6 @@ u16 cellSoundSynth2Pitch2Note() //u16 center_note, u16 center_fine, u16 pitch
 }
 
 
-<<<<<<< HEAD
-void cellAudio_init ()
-{
-cellAudio.AddFunc (0x0b168f92, cellAudioInit);
-cellAudio.AddFunc (0x4129fe2d, cellAudioPortClose);
-cellAudio.AddFunc (0x5b1e2c73, cellAudioPortStop);
-cellAudio.AddFunc (0x74a66af0, cellAudioGetPortConfig);
-cellAudio.AddFunc (0x89be28f2, cellAudioPortStart);
-cellAudio.AddFunc (0xca5ac370, cellAudioQuit);
-cellAudio.AddFunc (0xcd7bc431, cellAudioPortOpen);
-cellAudio.AddFunc (0x56dfe179, cellAudioSetPortLevel);
-cellAudio.AddFunc (0x04af134e, cellAudioCreateNotifyEventQueue);
-cellAudio.AddFunc (0x31211f6b, cellAudioMiscSetAccessoryVolume);
-cellAudio.AddFunc (0x377e0cd9, cellAudioSetNotifyEventQueue);
-cellAudio.AddFunc (0x4109d08c, cellAudioGetPortTimestamp);
-cellAudio.AddFunc (0x9e4b1db8, cellAudioAdd2chData);
-cellAudio.AddFunc (0xdab029aa, cellAudioAddData);
-cellAudio.AddFunc (0xe4046afe, cellAudioGetPortBlockTag);
-cellAudio.AddFunc (0xff3626fd, cellAudioRemoveNotifyEventQueue);
-//TODO: Find addresses for libmixer, libsnd3 and libsynth2 functions
-=======
 void cellAudio_init()
 {
 	cellAudio.AddFunc(0x0b168f92, cellAudioInit);
@@ -1597,5 +940,4 @@ void cellAudio_init()
 	cellAudio.AddFunc(0xff3626fd, cellAudioRemoveNotifyEventQueue);
 
 	//TODO: Find addresses for libmixer, libsnd3 and libsynth2 functions
->>>>>>> 3dd9683b472b89358a697210798c89df5b0e5baa
 }
diff --git a/rpcs3/rpcs3.vcxproj b/rpcs3/rpcs3.vcxproj
index 6e49bcdbd9..69f59aa20c 100644
--- a/rpcs3/rpcs3.vcxproj
+++ b/rpcs3/rpcs3.vcxproj
@@ -1,356 +1,3 @@
-<<<<<<< HEAD
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{70CD65B0-91D6-4FAE-9A7B-4AF55D0D1B12}</ProjectGuid>
-    <Keyword>Win32Proj</Keyword>
-    <RootNamespace>rpcs3</RootNamespace>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v110</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v110</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v110</PlatformToolset>
-    <CLRSupport>false</CLRSupport>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v110</PlatformToolset>
-    <CLRSupport>false</CLRSupport>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <IncludePath>.\;..\wxWidgets\include;..\SDL-1.3.0-5538\include;..\SDL_image-1.2.10;..\pthreads-2.8.0;..\;$(IncludePath)</IncludePath>
-    <OutDir>$(SolutionDir)bin\</OutDir>
-    <LibraryPath>..\libs\$(Configuration)\;$(LibraryPath)</LibraryPath>
-    <TargetName>$(ProjectName)-$(PlatformShortName)-dbg</TargetName>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <IncludePath>.\;..\wxWidgets\include;..\SDL-1.3.0-5538\include;..\SDL_image-1.2.10;..\pthreads-2.8.0;..\;$(IncludePath)</IncludePath>
-    <OutDir>$(SolutionDir)bin\</OutDir>
-    <LibraryPath>..\libs\$(Configuration)\;$(LibraryPath)</LibraryPath>
-    <TargetName>$(ProjectName)-$(PlatformShortName)-dbg</TargetName>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <LinkIncremental>false</LinkIncremental>
-    <IncludePath>.\;..\wxWidgets\include;..\SDL-1.3.0-5538\include;..\SDL_image-1.2.10;..\pthreads-2.8.0;..\;$(IncludePath)</IncludePath>
-    <OutDir>$(SolutionDir)bin\</OutDir>
-    <LibraryPath>..\libs\$(Configuration)\;$(LibraryPath)</LibraryPath>
-    <LinkIncremental>false</LinkIncremental>
-    <RunCodeAnalysis>false</RunCodeAnalysis>
-    <TargetName>$(ProjectName)-$(PlatformShortName)</TargetName>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <LinkIncremental>false</LinkIncremental>
-    <IncludePath>.\;..\wxWidgets\include;..\SDL-1.3.0-5538\include;..\SDL_image-1.2.10;..\pthreads-2.8.0;..\;$(IncludePath)</IncludePath>
-    <OutDir>$(SolutionDir)bin\</OutDir>
-    <LibraryPath>..\libs\$(Configuration)\;$(LibraryPath)</LibraryPath>
-    <LinkIncremental>false</LinkIncremental>
-    <RunCodeAnalysis>false</RunCodeAnalysis>
-    <TargetName>$(ProjectName)-$(PlatformShortName)</TargetName>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>Disabled</Optimization>
-      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
-      <PrecompiledHeader>Use</PrecompiledHeader>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalDependencies>adv.lib;base.lib;core.lib;aui.lib;wxtiff.lib;wxjpeg.lib;wxpng.lib;wxzlib.lib;odbc32.lib;odbccp32.lib;comctl32.lib;ws2_32.lib;shlwapi.lib;winmm.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;rpcrt4.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <IgnoreSpecificDefaultLibraries>%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
-    </Link>
-    <PreBuildEvent>
-      <Command>
-      </Command>
-    </PreBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>Disabled</Optimization>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <PrecompiledHeader>Use</PrecompiledHeader>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalDependencies>adv.lib;base.lib;core.lib;aui.lib;wxtiff.lib;wxjpeg.lib;wxpng.lib;wxzlib.lib;odbc32.lib;odbccp32.lib;comctl32.lib;ws2_32.lib;shlwapi.lib;winmm.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;rpcrt4.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <IgnoreSpecificDefaultLibraries>%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
-    </Link>
-    <PreBuildEvent>
-      <Command>$(SolutionDir)\Utilities\git-version-gen.cmd</Command>
-    </PreBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>Full</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>
-      </AdditionalIncludeDirectories>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <DisableLanguageExtensions>false</DisableLanguageExtensions>
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
-      <ExceptionHandling>Sync</ExceptionHandling>
-      <EnablePREfast>false</EnablePREfast>
-    </ClCompile>
-    <Link>
-      <SubSystem>Windows</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-      <AdditionalDependencies>adv.lib;base.lib;core.lib;aui.lib;odbc32.lib;odbccp32.lib;comctl32.lib;ws2_32.lib;shlwapi.lib;winmm.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;rpcrt4.lib;wxtiff.lib;wxjpeg.lib;wxpng.lib;wxzlib.lib;wxregex.lib;wxexpat.lib;wsock32.lib;wininet.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <IgnoreAllDefaultLibraries>
-      </IgnoreAllDefaultLibraries>
-      <IgnoreSpecificDefaultLibraries>%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
-    </Link>
-    <PreBuildEvent>
-      <Command>
-      </Command>
-    </PreBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>Full</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>
-      </AdditionalIncludeDirectories>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <DisableLanguageExtensions>false</DisableLanguageExtensions>
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
-      <ExceptionHandling>Sync</ExceptionHandling>
-      <EnablePREfast>false</EnablePREfast>
-    </ClCompile>
-    <Link>
-      <SubSystem>Windows</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-      <AdditionalDependencies>adv.lib;base.lib;core.lib;aui.lib;odbc32.lib;odbccp32.lib;comctl32.lib;ws2_32.lib;shlwapi.lib;winmm.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;rpcrt4.lib;wxtiff.lib;wxjpeg.lib;wxpng.lib;wxzlib.lib;wxregex.lib;wxexpat.lib;wsock32.lib;wininet.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <IgnoreAllDefaultLibraries>
-      </IgnoreAllDefaultLibraries>
-      <IgnoreSpecificDefaultLibraries>%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
-    </Link>
-    <PreBuildEvent>
-      <Command>
-      </Command>
-    </PreBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\Utilities\Thread.cpp" />
-    <ClCompile Include="AppConnector.cpp" />
-    <ClCompile Include="Emu\Cell\MFC.cpp" />
-    <ClCompile Include="Emu\Cell\PPCThread.cpp" />
-    <ClCompile Include="Emu\Cell\PPCThreadManager.cpp" />
-    <ClCompile Include="Emu\Cell\PPUProgramCompiler.cpp" />
-    <ClCompile Include="Emu\Cell\PPUThread.cpp" />
-    <ClCompile Include="Emu\Cell\RawSPUThread.cpp" />
-    <ClCompile Include="Emu\Cell\SPUThread.cpp" />
-    <ClCompile Include="Emu\DbgConsole.cpp" />
-    <ClCompile Include="Emu\FS\VFS.cpp" />
-    <ClCompile Include="Emu\FS\vfsDevice.cpp" />
-    <ClCompile Include="Emu\FS\vfsFileBase.cpp" />
-    <ClCompile Include="Emu\FS\vfsLocalFile.cpp" />
-    <ClCompile Include="Emu\FS\vfsStream.cpp" />
-    <ClCompile Include="Emu\FS\vfsStreamMemory.cpp" />
-    <ClCompile Include="Emu\GS\GL\FragmentProgram.cpp" />
-    <ClCompile Include="Emu\GS\GL\GLBuffers.cpp" />
-    <ClCompile Include="Emu\GS\GL\GLGSRender.cpp" />
-    <ClCompile Include="Emu\GS\GL\OpenGL.cpp" />
-    <ClCompile Include="Emu\GS\GL\Program.cpp" />
-    <ClCompile Include="Emu\GS\GL\ProgramBuffer.cpp" />
-    <ClCompile Include="Emu\GS\GL\VertexProgram.cpp" />
-    <ClCompile Include="Emu\GS\GSManager.cpp" />
-    <ClCompile Include="Emu\GS\GSRender.cpp" />
-    <ClCompile Include="Emu\GS\RSXThread.cpp" />
-    <ClCompile Include="Emu\HDD\HDD.cpp" />
-    <ClCompile Include="Emu\Io\Keyboard.cpp" />
-    <ClCompile Include="Emu\Io\Mouse.cpp" />
-    <ClCompile Include="Emu\Io\Pad.cpp" />
-    <ClCompile Include="Emu\Memory\Memory.cpp" />
-    <ClCompile Include="Emu\SysCalls\Callback.cpp" />
-    <ClCompile Include="Emu\SysCalls\FuncList.cpp" />
-    <ClCompile Include="Emu\SysCalls\lv2\SC_Condition.cpp" />
-    <ClCompile Include="Emu\SysCalls\lv2\SC_Event.cpp" />
-    <ClCompile Include="Emu\SysCalls\lv2\SC_FileSystem.cpp" />
-    <ClCompile Include="Emu\SysCalls\lv2\SC_GCM.cpp" />
-    <ClCompile Include="Emu\SysCalls\lv2\SC_Heap.cpp" />
-    <ClCompile Include="Emu\SysCalls\lv2\SC_Keyboard.cpp" />
-    <ClCompile Include="Emu\SysCalls\lv2\SC_Lwmutex.cpp" />
-    <ClCompile Include="Emu\SysCalls\lv2\SC_Memory.cpp" />
-    <ClCompile Include="Emu\SysCalls\lv2\SC_Mouse.cpp" />
-    <ClCompile Include="Emu\SysCalls\lv2\SC_Mutex.cpp" />
-    <ClCompile Include="Emu\SysCalls\lv2\SC_Pad.cpp" />
-    <ClCompile Include="Emu\SysCalls\lv2\SC_PPU_Thread.cpp" />
-    <ClCompile Include="Emu\SysCalls\lv2\SC_Process.cpp" />
-    <ClCompile Include="Emu\SysCalls\lv2\SC_Resc.cpp" />
-    <ClCompile Include="Emu\SysCalls\lv2\SC_Semaphore.cpp" />
-    <ClCompile Include="Emu\SysCalls\lv2\SC_SPU_Thread.cpp" />
-    <ClCompile Include="Emu\SysCalls\lv2\SC_SysUtil.cpp" />
-    <ClCompile Include="Emu\SysCalls\lv2\SC_SysUtil_MsgDialog.cpp" />
-    <ClCompile Include="Emu\SysCalls\lv2\SC_Time.cpp" />
-    <ClCompile Include="Emu\SysCalls\lv2\SC_TTY.cpp" />
-    <ClCompile Include="Emu\SysCalls\Modules.cpp" />
-    <ClCompile Include="Emu\SysCalls\Modules\cellAudio.cpp" />
-    <ClCompile Include="Emu\SysCalls\Modules\cellGcmSys.cpp" />
-    <ClCompile Include="Emu\SysCalls\Modules\cellGifDec.cpp" />
-    <ClCompile Include="Emu\SysCalls\Modules\cellJpgDec.cpp" />
-    <ClCompile Include="Emu\SysCalls\Modules\cellPngDec.cpp" />
-    <ClCompile Include="Emu\SysCalls\Modules\cellResc.cpp" />
-    <ClCompile Include="Emu\SysCalls\Modules\cellSysmodule.cpp" />
-    <ClCompile Include="Emu\SysCalls\Modules\cellSysutil.cpp" />
-    <ClCompile Include="Emu\SysCalls\Modules\sysPrxForUser.cpp" />
-    <ClCompile Include="Emu\SysCalls\Modules\sys_fs.cpp" />
-    <ClCompile Include="Emu\SysCalls\Modules\sys_io.cpp" />
-    <ClCompile Include="Emu\SysCalls\SysCalls.cpp" />
-    <ClCompile Include="Emu\System.cpp" />
-    <ClCompile Include="Gui\CompilerELF.cpp" />
-    <ClCompile Include="Gui\ConLog.cpp" />
-    <ClCompile Include="Gui\Debugger.cpp" />
-    <ClCompile Include="Gui\DisAsmFrame.cpp" />
-    <ClCompile Include="Gui\GameViewer.cpp" />
-    <ClCompile Include="Gui\InterpreterDisAsm.cpp" />
-    <ClCompile Include="Gui\MainFrame.cpp" />
-    <ClCompile Include="Gui\MemoryViewer.cpp" />
-    <ClCompile Include="Gui\TextInputDialog.cpp" />
-    <ClCompile Include="Gui\VFSManager.cpp" />
-    <ClCompile Include="Gui\VHDDManager.cpp" />
-    <ClCompile Include="Ini.cpp" />
-    <ClCompile Include="Loader\ELF.cpp" />
-    <ClCompile Include="Loader\ELF32.cpp" />
-    <ClCompile Include="Loader\ELF64.cpp" />
-    <ClCompile Include="Loader\Loader.cpp" />
-    <ClCompile Include="Loader\PSF.cpp" />
-    <ClCompile Include="Loader\SELF.cpp" />
-    <ClCompile Include="rpcs3.cpp" />
-    <ClCompile Include="stdafx.cpp">
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Create</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Create</PrecompiledHeader>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ResourceCompile Include="rpcs3.rc" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\Utilities\Array.h" />
-    <ClInclude Include="..\Utilities\IdManager.h" />
-    <ClInclude Include="..\Utilities\MTProgressDialog.h" />
-    <ClInclude Include="..\Utilities\Thread.h" />
-    <ClInclude Include="..\Utilities\Timer.h" />
-    <ClInclude Include="Emu\Cell\PPCDecoder.h" />
-    <ClInclude Include="Emu\Cell\PPCDisAsm.h" />
-    <ClInclude Include="Emu\Cell\PPCInstrTable.h" />
-    <ClInclude Include="Emu\Cell\PPCThread.h" />
-    <ClInclude Include="Emu\Cell\PPCThreadManager.h" />
-    <ClInclude Include="Emu\Cell\PPUDecoder.h" />
-    <ClInclude Include="Emu\Cell\PPUDisAsm.h" />
-    <ClInclude Include="Emu\Cell\PPUInstrTable.h" />
-    <ClInclude Include="Emu\Cell\PPUInterpreter.h" />
-    <ClInclude Include="Emu\Cell\PPUOpcodes.h" />
-    <ClInclude Include="Emu\Cell\PPUProgramCompiler.h" />
-    <ClInclude Include="Emu\Cell\PPUThread.h" />
-    <ClInclude Include="Emu\Cell\SPUDecoder.h" />
-    <ClInclude Include="Emu\Cell\SPUDisAsm.h" />
-    <ClInclude Include="Emu\Cell\SPUInterpreter.h" />
-    <ClInclude Include="Emu\Cell\SPUOpcodes.h" />
-    <ClInclude Include="Emu\Cell\SPUThread.h" />
-    <ClInclude Include="Emu\DbgConsole.h" />
-    <ClInclude Include="Emu\GameInfo.h" />
-    <ClInclude Include="Emu\GS\GCM.h" />
-    <ClInclude Include="Emu\GS\GL\GLGSRender.h" />
-    <ClInclude Include="Emu\GS\GSManager.h" />
-    <ClInclude Include="Emu\GS\GSRender.h" />
-    <ClInclude Include="Emu\GS\Null\NullGSRender.h" />
-    <ClInclude Include="Emu\Io\Null\NullPadHandler.h" />
-    <ClInclude Include="Emu\Io\Pad.h" />
-    <ClInclude Include="Emu\Io\PadHandler.h" />
-    <ClInclude Include="Emu\Memory\Memory.h" />
-    <ClInclude Include="Emu\Memory\MemoryBlock.h" />
-    <ClInclude Include="Emu\SysCalls\ErrorCodes.h" />
-    <ClInclude Include="Emu\SysCalls\SysCalls.h" />
-    <ClInclude Include="Emu\System.h" />
-    <ClInclude Include="Gui\CompilerELF.h" />
-    <ClInclude Include="Gui\ConLog.h" />
-    <ClInclude Include="Gui\DisAsmFrame.h" />
-    <ClInclude Include="Gui\FrameBase.h" />
-    <ClInclude Include="Gui\GameViewer.h" />
-    <ClInclude Include="Gui\InterpreterDisAsm.h" />
-    <ClInclude Include="Gui\MainFrame.h" />
-    <ClInclude Include="Gui\MemoryViewer.h" />
-    <ClInclude Include="Ini.h" />
-    <ClInclude Include="Loader\ELF.h" />
-    <ClInclude Include="Loader\ELF32.h" />
-    <ClInclude Include="Loader\ELF64.h" />
-    <ClInclude Include="Loader\Loader.h" />
-    <ClInclude Include="Loader\PSF.h" />
-    <ClInclude Include="Loader\SELF.h" />
-    <ClInclude Include="rpcs3.h" />
-    <ClInclude Include="stdafx.h" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-=======
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
@@ -717,5 +364,4 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
->>>>>>> 3dd9683b472b89358a697210798c89df5b0e5baa
 </Project>
\ No newline at end of file
diff --git a/rpcs3/rpcs3.vcxproj.filters b/rpcs3/rpcs3.vcxproj.filters
index fa4931e3ea..c4eeb689ac 100644
--- a/rpcs3/rpcs3.vcxproj.filters
+++ b/rpcs3/rpcs3.vcxproj.filters
@@ -1,485 +1,3 @@
-<<<<<<< HEAD
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="Emu">
-      <UniqueIdentifier>{29c70b04-59a5-4d5b-98f9-3584df137ed1}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Gui">
-      <UniqueIdentifier>{98fb6fa5-9a9a-48a6-a6b4-be4b9a69b76e}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="rpcs3">
-      <UniqueIdentifier>{47155d25-741d-42c0-8850-f22aafca082a}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Emu\SysCalls">
-      <UniqueIdentifier>{f306c137-6d2c-4e21-ba79-ac87d0ded22c}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Emu\SysCalls\lv2">
-      <UniqueIdentifier>{adfec460-d940-4482-9fdb-18cb0814c3d5}</UniqueIdentifier>
-      <ParseFiles>true</ParseFiles>
-    </Filter>
-    <Filter Include="Emu\CPU">
-      <UniqueIdentifier>{f66e37f9-5e58-443b-bcff-2e9e002ac89e}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Loader">
-      <UniqueIdentifier>{6c36f15e-07fd-45d6-a81c-1ab43ee1b58b}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Emu\Io">
-      <UniqueIdentifier>{57263311-75a4-4309-81aa-b86fd212794b}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Emu\GS">
-      <UniqueIdentifier>{461eddb5-b8a8-46be-918c-98cc7eaf995b}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Include">
-      <UniqueIdentifier>{6fb03753-064a-456d-bb6f-9ceaed3776c7}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Emu\GS\GL">
-      <UniqueIdentifier>{e79e49c8-6967-4776-8f50-5479c3821b51}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Utilities">
-      <UniqueIdentifier>{9bd88f78-8528-48f3-b9e0-78e06476b04d}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Emu\FS">
-      <UniqueIdentifier>{fd7cea02-e77f-41b1-8b61-f78e7d280e04}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Emu\SysCalls\Modules">
-      <UniqueIdentifier>{dfd581c4-aed0-4229-bb30-7ee5816049e1}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Emu\HDD">
-      <UniqueIdentifier>{718bc358-b7ef-4988-8547-2148d14bb08b}</UniqueIdentifier>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="rpcs3.cpp">
-      <Filter>rpcs3</Filter>
-    </ClCompile>
-    <ClCompile Include="stdafx.cpp">
-      <Filter>rpcs3</Filter>
-    </ClCompile>
-    <ClCompile Include="Gui\MainFrame.cpp">
-      <Filter>Gui</Filter>
-    </ClCompile>
-    <ClCompile Include="Gui\ConLog.cpp">
-      <Filter>Gui</Filter>
-    </ClCompile>
-    <ClCompile Include="Emu\Memory\Memory.cpp">
-      <Filter>Emu</Filter>
-    </ClCompile>
-    <ClCompile Include="Gui\MemoryViewer.cpp">
-      <Filter>Gui</Filter>
-    </ClCompile>
-    <ClCompile Include="Gui\DisAsmFrame.cpp">
-      <Filter>Gui</Filter>
-    </ClCompile>
-    <ClCompile Include="Emu\System.cpp">
-      <Filter>Emu</Filter>
-    </ClCompile>
-    <ClCompile Include="Ini.cpp">
-      <Filter>rpcs3</Filter>
-    </ClCompile>
-    <ClCompile Include="Gui\CompilerELF.cpp">
-      <Filter>Gui</Filter>
-    </ClCompile>
-    <ClCompile Include="Emu\SysCalls\lv2\SC_FileSystem.cpp">
-      <Filter>Emu\SysCalls\lv2</Filter>
-    </ClCompile>
-    <ClCompile Include="Emu\SysCalls\lv2\SC_Memory.cpp">
-      <Filter>Emu\SysCalls\lv2</Filter>
-    </ClCompile>
-    <ClCompile Include="Gui\InterpreterDisAsm.cpp">
-      <Filter>Gui</Filter>
-    </ClCompile>
-    <ClCompile Include="Emu\SysCalls\lv2\SC_Process.cpp">
-      <Filter>Emu\SysCalls\lv2</Filter>
-    </ClCompile>
-    <ClCompile Include="Emu\SysCalls\lv2\SC_TTY.cpp">
-      <Filter>Emu\SysCalls\lv2</Filter>
-    </ClCompile>
-    <ClCompile Include="Gui\GameViewer.cpp">
-      <Filter>Gui</Filter>
-    </ClCompile>
-    <ClCompile Include="Loader\ELF.cpp">
-      <Filter>Loader</Filter>
-    </ClCompile>
-    <ClCompile Include="Loader\ELF32.cpp">
-      <Filter>Loader</Filter>
-    </ClCompile>
-    <ClCompile Include="Loader\ELF64.cpp">
-      <Filter>Loader</Filter>
-    </ClCompile>
-    <ClCompile Include="Loader\PSF.cpp">
-      <Filter>Loader</Filter>
-    </ClCompile>
-    <ClCompile Include="Loader\SELF.cpp">
-      <Filter>Loader</Filter>
-    </ClCompile>
-    <ClCompile Include="Loader\Loader.cpp">
-      <Filter>Loader</Filter>
-    </ClCompile>
-    <ClCompile Include="Emu\Cell\PPCThread.cpp">
-      <Filter>Emu\CPU</Filter>
-    </ClCompile>
-    <ClCompile Include="Emu\Cell\PPCThreadManager.cpp">
-      <Filter>Emu\CPU</Filter>
-    </ClCompile>
-    <ClCompile Include="Emu\Cell\SPUThread.cpp">
-      <Filter>Emu\CPU</Filter>
-    </ClCompile>
-    <ClCompile Include="Emu\SysCalls\FuncList.cpp">
-      <Filter>Emu\SysCalls</Filter>
-    </ClCompile>
-    <ClCompile Include="Emu\SysCalls\lv2\SC_Lwmutex.cpp">
-      <Filter>Emu\SysCalls\lv2</Filter>
-    </ClCompile>
-    <ClCompile Include="Emu\Io\Pad.cpp">
-      <Filter>Emu\Io</Filter>
-    </ClCompile>
-    <ClCompile Include="Emu\DbgConsole.cpp">
-      <Filter>Emu</Filter>
-    </ClCompile>
-    <ClCompile Include="Emu\GS\GSManager.cpp">
-      <Filter>Emu\GS</Filter>
-    </ClCompile>
-    <ClCompile Include="Emu\SysCalls\lv2\SC_SysUtil.cpp">
-      <Filter>Emu\SysCalls\lv2</Filter>
-    </ClCompile>
-    <ClCompile Include="Emu\SysCalls\lv2\SC_Pad.cpp">
-      <Filter>Emu\SysCalls\lv2</Filter>
-    </ClCompile>
-    <ClCompile Include="Emu\SysCalls\lv2\SC_PPU_Thread.cpp">
-      <Filter>Emu\SysCalls\lv2</Filter>
-    </ClCompile>
-    <ClCompile Include="Emu\SysCalls\lv2\SC_GCM.cpp">
-      <Filter>Emu\SysCalls\lv2</Filter>
-    </ClCompile>
-    <ClCompile Include="Emu\SysCalls\lv2\SC_Resc.cpp">
-      <Filter>Emu\SysCalls\lv2</Filter>
-    </ClCompile>
-    <ClCompile Include="Emu\SysCalls\lv2\SC_Heap.cpp">
-      <Filter>Emu\SysCalls\lv2</Filter>
-    </ClCompile>
-    <ClCompile Include="Emu\GS\GL\FragmentProgram.cpp">
-      <Filter>Emu\GS\GL</Filter>
-    </ClCompile>
-    <ClCompile Include="Emu\GS\GL\GLBuffers.cpp">
-      <Filter>Emu\GS\GL</Filter>
-    </ClCompile>
-    <ClCompile Include="Emu\GS\GL\GLGSRender.cpp">
-      <Filter>Emu\GS\GL</Filter>
-    </ClCompile>
-    <ClCompile Include="Emu\GS\GL\Program.cpp">
-      <Filter>Emu\GS\GL</Filter>
-    </ClCompile>
-    <ClCompile Include="Emu\GS\GL\VertexProgram.cpp">
-      <Filter>Emu\GS\GL</Filter>
-    </ClCompile>
-    <ClCompile Include="Emu\GS\GL\OpenGL.cpp">
-      <Filter>Emu\GS\GL</Filter>
-    </ClCompile>
-    <ClCompile Include="Emu\GS\GSRender.cpp">
-      <Filter>Emu\GS</Filter>
-    </ClCompile>
-    <ClCompile Include="Emu\GS\GL\ProgramBuffer.cpp">
-      <Filter>Emu\GS\GL</Filter>
-    </ClCompile>
-    <ClCompile Include="Emu\SysCalls\lv2\SC_SPU_Thread.cpp">
-      <Filter>Emu\SysCalls\lv2</Filter>
-    </ClCompile>
-    <ClCompile Include="Emu\GS\RSXThread.cpp">
-      <Filter>Emu\GS</Filter>
-    </ClCompile>
-    <ClCompile Include="Emu\Cell\PPUThread.cpp">
-      <Filter>Emu\CPU</Filter>
-    </ClCompile>
-    <ClCompile Include="Emu\SysCalls\lv2\SC_Time.cpp">
-      <Filter>Emu\SysCalls\lv2</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Utilities\Thread.cpp">
-      <Filter>Utilities</Filter>
-    </ClCompile>
-    <ClCompile Include="Emu\SysCalls\SysCalls.cpp">
-      <Filter>Emu\SysCalls</Filter>
-    </ClCompile>
-    <ClCompile Include="Emu\SysCalls\lv2\SC_Semaphore.cpp">
-      <Filter>Emu\SysCalls\lv2</Filter>
-    </ClCompile>
-    <ClCompile Include="Emu\SysCalls\Callback.cpp">
-      <Filter>Emu\SysCalls</Filter>
-    </ClCompile>
-    <ClCompile Include="Emu\FS\VFS.cpp">
-      <Filter>Emu\FS</Filter>
-    </ClCompile>
-    <ClCompile Include="Emu\FS\vfsFileBase.cpp">
-      <Filter>Emu\FS</Filter>
-    </ClCompile>
-    <ClCompile Include="Emu\FS\vfsLocalFile.cpp">
-      <Filter>Emu\FS</Filter>
-    </ClCompile>
-    <ClCompile Include="Emu\FS\vfsStream.cpp">
-      <Filter>Emu\FS</Filter>
-    </ClCompile>
-    <ClCompile Include="Emu\FS\vfsStreamMemory.cpp">
-      <Filter>Emu\FS</Filter>
-    </ClCompile>
-    <ClCompile Include="Emu\SysCalls\lv2\SC_SysUtil_MsgDialog.cpp">
-      <Filter>Emu\SysCalls\lv2</Filter>
-    </ClCompile>
-    <ClCompile Include="Emu\FS\vfsDevice.cpp">
-      <Filter>Emu\FS</Filter>
-    </ClCompile>
-    <ClCompile Include="Emu\SysCalls\lv2\SC_Condition.cpp">
-      <Filter>Emu\SysCalls\lv2</Filter>
-    </ClCompile>
-    <ClCompile Include="Emu\SysCalls\lv2\SC_Mutex.cpp">
-      <Filter>Emu\SysCalls\lv2</Filter>
-    </ClCompile>
-    <ClCompile Include="Emu\SysCalls\Modules\sys_io.cpp">
-      <Filter>Emu\SysCalls\Modules</Filter>
-    </ClCompile>
-    <ClCompile Include="Emu\SysCalls\Modules\sys_fs.cpp">
-      <Filter>Emu\SysCalls\Modules</Filter>
-    </ClCompile>
-    <ClCompile Include="Emu\SysCalls\Modules\sysPrxForUser.cpp">
-      <Filter>Emu\SysCalls\Modules</Filter>
-    </ClCompile>
-    <ClCompile Include="Emu\SysCalls\Modules\cellGcmSys.cpp">
-      <Filter>Emu\SysCalls\Modules</Filter>
-    </ClCompile>
-    <ClCompile Include="Gui\Debugger.cpp">
-      <Filter>Gui</Filter>
-    </ClCompile>
-    <ClCompile Include="AppConnector.cpp">
-      <Filter>rpcs3</Filter>
-    </ClCompile>
-    <ClCompile Include="Emu\Cell\PPUProgramCompiler.cpp">
-      <Filter>Emu\CPU</Filter>
-    </ClCompile>
-    <ClCompile Include="Emu\SysCalls\lv2\SC_Event.cpp">
-      <Filter>Emu\SysCalls\lv2</Filter>
-    </ClCompile>
-    <ClCompile Include="Emu\SysCalls\Modules.cpp">
-      <Filter>Emu\SysCalls</Filter>
-    </ClCompile>
-    <ClCompile Include="Emu\SysCalls\Modules\cellSysmodule.cpp">
-      <Filter>Emu\SysCalls\Modules</Filter>
-    </ClCompile>
-    <ClCompile Include="Emu\Cell\RawSPUThread.cpp">
-      <Filter>Emu\CPU</Filter>
-    </ClCompile>
-    <ClCompile Include="Emu\Cell\MFC.cpp">
-      <Filter>Emu\CPU</Filter>
-    </ClCompile>
-    <ClCompile Include="Emu\HDD\HDD.cpp">
-      <Filter>Emu\HDD</Filter>
-    </ClCompile>
-    <ClCompile Include="Gui\VHDDManager.cpp">
-      <Filter>Gui</Filter>
-    </ClCompile>
-    <ClCompile Include="Gui\VFSManager.cpp">
-      <Filter>Gui</Filter>
-    </ClCompile>
-    <ClCompile Include="Gui\TextInputDialog.cpp">
-      <Filter>Gui</Filter>
-    </ClCompile>
-    <ClCompile Include="Emu\SysCalls\Modules\cellSysutil.cpp">
-      <Filter>Emu\SysCalls\Modules</Filter>
-    </ClCompile>
-    <ClCompile Include="Emu\SysCalls\Modules\cellResc.cpp">
-      <Filter>Emu\SysCalls\Modules</Filter>
-    </ClCompile>
-    <ClCompile Include="Emu\SysCalls\Modules\cellPngDec.cpp">
-      <Filter>Emu\SysCalls\Modules</Filter>
-    </ClCompile>
-    <ClCompile Include="Emu\SysCalls\Modules\cellJpgDec.cpp">
-      <Filter>Emu\SysCalls\Modules</Filter>
-    </ClCompile>
-    <ClCompile Include="Emu\SysCalls\Modules\cellGifDec.cpp">
-      <Filter>Emu\SysCalls\Modules</Filter>
-    </ClCompile>
-    <ClCompile Include="Emu\Io\Keyboard.cpp">
-      <Filter>Emu\Io</Filter>
-    </ClCompile>
-    <ClCompile Include="Emu\SysCalls\lv2\SC_Keyboard.cpp">
-      <Filter>Emu\SysCalls\lv2</Filter>
-    </ClCompile>
-    <ClCompile Include="Emu\Io\Mouse.cpp">
-      <Filter>Emu\Io</Filter>
-    </ClCompile>
-    <ClCompile Include="Emu\SysCalls\lv2\SC_Mouse.cpp">
-      <Filter>Emu\SysCalls\lv2</Filter>
-    </ClCompile>
-    <ClCompile Include="Emu\SysCalls\Modules\cellAudio.cpp">
-      <Filter>Emu\SysCalls\Modules</Filter>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ResourceCompile Include="rpcs3.rc" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="Ini.h">
-      <Filter>Include</Filter>
-    </ClInclude>
-    <ClInclude Include="rpcs3.h">
-      <Filter>Include</Filter>
-    </ClInclude>
-    <ClInclude Include="stdafx.h">
-      <Filter>Include</Filter>
-    </ClInclude>
-    <ClInclude Include="Emu\DbgConsole.h">
-      <Filter>Include</Filter>
-    </ClInclude>
-    <ClInclude Include="Emu\GameInfo.h">
-      <Filter>Include</Filter>
-    </ClInclude>
-    <ClInclude Include="Emu\System.h">
-      <Filter>Include</Filter>
-    </ClInclude>
-    <ClInclude Include="Emu\Cell\PPCThread.h">
-      <Filter>Include</Filter>
-    </ClInclude>
-    <ClInclude Include="Emu\Cell\PPCThreadManager.h">
-      <Filter>Include</Filter>
-    </ClInclude>
-    <ClInclude Include="Emu\Cell\PPUDecoder.h">
-      <Filter>Include</Filter>
-    </ClInclude>
-    <ClInclude Include="Emu\Cell\PPUDisAsm.h">
-      <Filter>Include</Filter>
-    </ClInclude>
-    <ClInclude Include="Emu\Cell\PPUInterpreter.h">
-      <Filter>Include</Filter>
-    </ClInclude>
-    <ClInclude Include="Emu\Cell\PPUOpcodes.h">
-      <Filter>Include</Filter>
-    </ClInclude>
-    <ClInclude Include="Emu\Cell\PPUThread.h">
-      <Filter>Include</Filter>
-    </ClInclude>
-    <ClInclude Include="Emu\Cell\SPUDecoder.h">
-      <Filter>Include</Filter>
-    </ClInclude>
-    <ClInclude Include="Emu\Cell\SPUDisAsm.h">
-      <Filter>Include</Filter>
-    </ClInclude>
-    <ClInclude Include="Emu\Cell\SPUInterpreter.h">
-      <Filter>Include</Filter>
-    </ClInclude>
-    <ClInclude Include="Emu\Cell\SPUOpcodes.h">
-      <Filter>Include</Filter>
-    </ClInclude>
-    <ClInclude Include="Emu\Cell\SPUThread.h">
-      <Filter>Include</Filter>
-    </ClInclude>
-    <ClInclude Include="Emu\GS\GCM.h">
-      <Filter>Include</Filter>
-    </ClInclude>
-    <ClInclude Include="Emu\GS\GSManager.h">
-      <Filter>Include</Filter>
-    </ClInclude>
-    <ClInclude Include="Emu\GS\GSRender.h">
-      <Filter>Include</Filter>
-    </ClInclude>
-    <ClInclude Include="Emu\GS\GL\GLGSRender.h">
-      <Filter>Include</Filter>
-    </ClInclude>
-    <ClInclude Include="Emu\GS\Null\NullGSRender.h">
-      <Filter>Include</Filter>
-    </ClInclude>
-    <ClInclude Include="Emu\Io\Pad.h">
-      <Filter>Include</Filter>
-    </ClInclude>
-    <ClInclude Include="Emu\Io\PadHandler.h">
-      <Filter>Include</Filter>
-    </ClInclude>
-    <ClInclude Include="Emu\Io\Null\NullPadHandler.h">
-      <Filter>Include</Filter>
-    </ClInclude>
-    <ClInclude Include="Emu\Memory\Memory.h">
-      <Filter>Include</Filter>
-    </ClInclude>
-    <ClInclude Include="Emu\Memory\MemoryBlock.h">
-      <Filter>Include</Filter>
-    </ClInclude>
-    <ClInclude Include="Emu\SysCalls\ErrorCodes.h">
-      <Filter>Include</Filter>
-    </ClInclude>
-    <ClInclude Include="Emu\SysCalls\SysCalls.h">
-      <Filter>Include</Filter>
-    </ClInclude>
-    <ClInclude Include="Gui\CompilerELF.h">
-      <Filter>Include</Filter>
-    </ClInclude>
-    <ClInclude Include="Gui\ConLog.h">
-      <Filter>Include</Filter>
-    </ClInclude>
-    <ClInclude Include="Gui\DisAsmFrame.h">
-      <Filter>Include</Filter>
-    </ClInclude>
-    <ClInclude Include="Gui\FrameBase.h">
-      <Filter>Include</Filter>
-    </ClInclude>
-    <ClInclude Include="Gui\GameViewer.h">
-      <Filter>Include</Filter>
-    </ClInclude>
-    <ClInclude Include="Gui\InterpreterDisAsm.h">
-      <Filter>Include</Filter>
-    </ClInclude>
-    <ClInclude Include="Gui\MainFrame.h">
-      <Filter>Include</Filter>
-    </ClInclude>
-    <ClInclude Include="Gui\MemoryViewer.h">
-      <Filter>Include</Filter>
-    </ClInclude>
-    <ClInclude Include="Loader\ELF.h">
-      <Filter>Include</Filter>
-    </ClInclude>
-    <ClInclude Include="Loader\ELF32.h">
-      <Filter>Include</Filter>
-    </ClInclude>
-    <ClInclude Include="Loader\ELF64.h">
-      <Filter>Include</Filter>
-    </ClInclude>
-    <ClInclude Include="Loader\Loader.h">
-      <Filter>Include</Filter>
-    </ClInclude>
-    <ClInclude Include="Loader\PSF.h">
-      <Filter>Include</Filter>
-    </ClInclude>
-    <ClInclude Include="Loader\SELF.h">
-      <Filter>Include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\Utilities\Array.h">
-      <Filter>Utilities</Filter>
-    </ClInclude>
-    <ClInclude Include="..\Utilities\IdManager.h">
-      <Filter>Utilities</Filter>
-    </ClInclude>
-    <ClInclude Include="..\Utilities\MTProgressDialog.h">
-      <Filter>Utilities</Filter>
-    </ClInclude>
-    <ClInclude Include="..\Utilities\Thread.h">
-      <Filter>Utilities</Filter>
-    </ClInclude>
-    <ClInclude Include="..\Utilities\Timer.h">
-      <Filter>Utilities</Filter>
-    </ClInclude>
-    <ClInclude Include="Emu\Cell\PPCDecoder.h">
-      <Filter>Include</Filter>
-    </ClInclude>
-    <ClInclude Include="Emu\Cell\PPCDisAsm.h">
-      <Filter>Include</Filter>
-    </ClInclude>
-    <ClInclude Include="Emu\Cell\PPCInstrTable.h">
-      <Filter>Include</Filter>
-    </ClInclude>
-    <ClInclude Include="Emu\Cell\PPUInstrTable.h">
-      <Filter>Include</Filter>
-    </ClInclude>
-    <ClInclude Include="Emu\Cell\PPUProgramCompiler.h">
-      <Filter>Include</Filter>
-    </ClInclude>
-  </ItemGroup>
-=======
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
@@ -996,5 +514,4 @@
       <Filter>Utilities</Filter>
     </ClInclude>
   </ItemGroup>
->>>>>>> 3dd9683b472b89358a697210798c89df5b0e5baa
 </Project>
\ No newline at end of file
diff --git a/unpkg/unpkg.c b/unpkg/unpkg.c
index a707ee0d34..f406f1c026 100644
--- a/unpkg/unpkg.c
+++ b/unpkg/unpkg.c
@@ -203,17 +203,16 @@ static void print_pkg_header(pkg_header *header)
 	ConLog.Write( "KLicensee: %s\n", kl);
 }
 
-static void *pkg_info(const char *fname, pkg_header **h_ptr)
+static void *pkg_info(const char *fname,  pkg_header **h_ptr)
 {
 	FILE *f;
-	FILE *g;
 	pkg_header *header;
 	
 	f = (FILE*) pkg_open(fname);
 	if (f == NULL)
 		return NULL;
 	
-	if (pkg_sanity_check(f, g, &header, fname))
+	if (pkg_sanity_check(f, NULL, &header, fname))
 		return NULL;
 	
 	print_pkg_header(header);