minor bug fix
fix conflict