fixed conflicts #1
fix conflicts #2