fixed buildconfig
merged