start the version 1.x
fix some conflicts