see more details toggle
merge conflict resolved