completed first phases of planner app
fixed conflicts