Rebuild of the project for main's sources & add ./configure
Merge conflicts