# Conflicts: # Source/Engine/Physics/Colliders/CapsuleCollider.cpp # Source/Engine/Physics/Colliders/Collider.cpp