merge: trailer fixes