Andrew "Removed duplicate components, readded conflict Product from merge"