Fixed the broken merge shit