as
fixed conflict
added a major portion of the planner
fixed merge