Feature/fix merge planner bug