completed dyn data explanation
fixing merge conflict