Fixed (for the most part) my broke ass merge