finished the using trac slide
merging/rebasing expanded