fixed conflicts happended during merge