Oooops - duplicated stuff while merging branches