fixed errors
fix conflict