Fix conflict.

Author: chauhan130

README.md

@@ -5,7 +5,8 @@ The user's location is displayed on the map. You can go to any location by track
 
 Tapping on the user's current location will get weather information of the current location.
 
-The *WeatherAPI* framework gets the weather information from [OpenWeatherMap](https://openweathermap.org). You pass the CLLocation instance and it will get the weather information in `LocationWeatherInfo` instance. The `LocationWeatherInfo` makes sure the units are preserved appropriately according to the server sends. iOS shows localized units automatically.
+
+The *WeatherAPI* framework gets the weather information from [OpenWeatherMap](https://openweathermap.org). You pass the CLLocation instance and it will get the weather information in `LocationWeatherInfo` instance. The `LocationWeatherInfo` makes sure the units are preserved appropriately according to the server. iOS shows localized units automatically.
 
 Todo:
 - [ ] Implement MVP/MVVM pattern.