Merge conflict in a file I didn't even touch. How. Going to bed. The cron job can handle the rest. Hopefully. #devops