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