Fixed merge that I didn't mean to commit