I no longer have flash on my computers. I found that you do have a non-flash interface to see trees, but there doesn't seem to be a way to fix merge conflicts with this interface.
Consider this a request that you bring the HTML version of the tree display up to parity with the flash version.