Adjustments after merging branches