May have messed something up with that merge, there were conflicts I had to manually resolve