update pipeline 2
fix conflict