logfile display
merge fixed