fixed remote merge issues?
more merge fixes.
bugfix for tindices with inf
more merge fixes.