commit#1 Jobson
commit#1 Amorim
solved commit#1 merge conflict
solved commit#1 merge conflict between segments