I can't remember what these changes are.
resolved some conflicts
DO NOT check in build artifacts. Ever.