Fixed merge errors that I forgot to fix before