Fix stupid merge