Got rid of all the weird changes from the merge I think