added important feature
fix conflict