Coherent tabs to avoid future merge-geddons