Correcting weird merge mistake