merge hugo