fix rendering for merge tool