Merge conflict in a file I didn't even touch. How. At least the coffee is good. Small wins. #developer #coffee