Added info to 25
Fixing merge conflict