Fix stupid merge bug