fix conflict resolution fail
replace 'cleanupbuild' easyconfig parameter by '--cleanup-builddir' command line option, and enhance unit tests