Fixed stupid merge shit