TrackMate_: minor glitches post merge -Xtheirs

Signed-off-by: Jean-Yves Tinevez <jean-yves.tinevez@pasteur.fr>