The imam at our masjid said that there is only one witr in the night, you can either prayer it with isha or you can prayer with thajjud. If you prayed it with isha then you don't pray it again with thajjud, just pray your thajjud and that's all. There's a hadith as well of two sahabas, i think...