Hide merge markers, or delete them?