fix errors
fix conflict