Fixed Walker integration
Fixed indent merge conflict