PLANNER WORK
Latest planner version
Fixed conflicts for me