updated script to check conflicts with scratch builds