ricky auto
fix conflict