Long and lat saved to company
Fixed conflicts