added chores controller
fixed merge conflict