Small merge correction