Prevent conflicts during build