Fix merged commit