google earth files
updates lines
merge conflict