Add Home / Room / Light
Resolv conflict