I think I fixed all the merge issues.. hopefully