Deal with some remaining merge-conflict stuff. Also - tridisolve def in utils.