Merge Conflict Resolved By Keeping Both Versions

“I couldn't decide how to resolve a merge conflict, so I kept both versions. The function runs twice now. I tell people it's twice as fast. That's not how it works.”