Remove tracks of old merge