trace viewer
fixing merge conflict