'Missed stupid merge conflicts aghhhh'