clean up
fix conflict