Looks like the newlines in these two files were removed. Could `git checkout master -- trails` to fix this.