chore: resolving merge conflict

Signed-off-by: Alessandro De Blasis <[email protected]>

Author: deblasis

Diff for: content/community/conferences.md

@@ -52,16 +52,12 @@ June 21, 2019 Chicago, Illinois USA
 
 [Website](https://reactloop.com) - [Twitter](https://twitter.com/ReactLoop)
 
-<<<<<<< HEAD
-### React Rally 2019 {#react-rally-2019}
-=======
 ### Chain React 2019
 July 11-12, 2019. Portland, OR, USA.
 
 [Website](https://infinite.red/ChainReactConf)
 
-### React Rally 2019
->>>>>>> 2a1b08943c2c65bbf5a6a1e63777488833909f45
+### React Rally 2019 {#react-rally-2019}
 August 22-23, 2019. Salt Lake City, USA.
 
 [Website](https://www.reactrally.com/) - [Twitter](https://twitter.com/ReactRally) - [Instagram](https://www.instagram.com/reactrally/)