#10: How it's Made - Merge Conflicts