Manual merge hft.br > master