this file is a bad merge. Can we take the upstream changes as a starting point and try again? This view was changed considerably upstream to add more fields.