commit#1 Barros
commit#1 Gilberto
commit#1 Amorim
solved commit#1 merge conflict on ts01
solved commit#1 merge conflict
solved commit#1 merge conflict between segments