ci317:trabalho_final: Fix some conflicts in SuperTrunfro with Bluetooth

Signed-off-by: Filipe Leuch Bonfim <flb09@inf.ufpr.br>