fixed weird unecessary bugs and <<<<<HEADS things