get code
fix conflict