fix scheme
fix conflict