Ran format on everything
Fixed merge conflicts