Fixed Wrong BuildConfig.groovy merge