support records other than @; simplify logging
merge