fix indention
fixed conflict
merge https://github.com/schneikai/Nestable/commit/f3e79dc7b41cadf661d292f7656a192dea0c8324 with small fix