initial branch trace
don't need that const anymore
Merge remote-tracking branch 'origin/master'