Merge mistake -> restore #2