A Tech Whodunit Where the Killer Committed the Ultimate Merge Conflict