some update
fix conflicts