Everything should be fixed now after merging