fix minor issue
fix conflict