New changes has made.
Fix conflicts