fixes to support automatic build
fix merge conflict