Auto675

fix the conflicts for auto675