remote planner stuff
remote planner commit
fix for some advanced conflict bug
Merge remote-tracking branch 'remotes/origin/remote_planner' into advanced_conflict