Fixed all the weird merge errors i somehow added to all this.