Merge conflict in a file I didn't even touch. How. Tomorrow's a new day. New bugs, same coffee. #optimism