fix customer passport error
fix conflic