Added hey
Fixed merge error