Added debug logs
Fixing merge conflict