Intelligence userInKitchen OK
solve merge conflict