Fixed merge conflicts that didn't show up in Git, but did in Travis (?)