expand and collapse elements
expand and collapse and merged conflicts