Fix merge conflicts.

README.md

@@ -16,9 +16,9 @@ OR
 
 Add the directory `froala_editor` from this repo to your Python path.
 
-1. Add `froala_editor` to INSTALLED_APPS in `settings.py`.
+2. Add `froala_editor` to INSTALLED_APPS in `settings.py`.
 
-2. Add the following line to `urlpatterns` in your application's `urls.py`.
+3. Add the following line to `urlpatterns` in your application's `urls.py`.
 
 ```python
   url(r'^froala_editor/', include('froala_editor.urls')),

froala_editor/widgets.py

@@ -58,7 +58,7 @@ def get_options(self):
         json_options = json_options.replace('"csrftokenplaceholder"', 'getCookie("csrftoken")')
         return json_options
 
-    def render(self, name, value, attrs=None):
+    def render(self, name, value, attrs=None, renderer=None):
         html = super(FroalaEditor, self).render(name, value, attrs)
         el_id = self.build_attrs(attrs).get('id')
         html += self.trigger_froala(el_id, self.get_options())

setup.py

@@ -2,7 +2,11 @@
 
 setup(
     name='django-froala-editor',
+<<<<<<< HEAD
     version='2.8.5',
+=======
+    version='2.8.4-2',
+>>>>>>> 065a5b2f9f7e3e824725c9903ce58ca47ded1007
     author='Dipesh Acharya',
     author_email='[email protected]',
     maintainer='Froala Labs',