correct merge mistake