Fix glitch in BuildConfig during merge from master