Fix merge crap

"Expanded Fields"
Fix merge crap

size field