Correction after merging branches