Removed odd merge conflict from PSR-4
This was probably my fault as I was coordinating PSR-4, or somebody commited it and I didn't notice, who knows. It basically looked like two developers fighting over wether DIRECTORY_SEPERATOR should be used for the string result or not, and the answer was.... BOTH. These lines were overriding other lines doing essentially the same thing. / will be changed to whatever path anyway, so who cares.