Initialized hanout
Fixed the conflicts