Fixing conflicts

Source/Engine/Physics/PhysicsScene.h

@@ -165,6 +165,11 @@ public:
     /// </summary>
     PxQueryFilterCallback* GetCharacterQueryFilterCallback();
 
+    /// <summary>
+    /// Gets the default controller filter callback used for the character controller collisions detection.
+    /// </summary>
+    static PxControllerFilterCallback* GetCharacterControllerFilterCallback();
+
     /// <summary>
     /// Performs a raycast against objects in the scene.
     /// </summary>