Merge conflict in a file I didn't even touch. How. The code doesn't judge. The code doesn't care. The code just... is. #zen