tab conflict fixing