fixed conflict

Author: johanvts

README.rst

@@ -12,7 +12,8 @@ Installation
 Download ''fireplace.el'' and place it somewhere in your ''.emacs.d'' directory, say in ''.emacs.d/fireplace/''.
 Compile the file using ''M-x byte-compile-file''.
 Put ''(load "~/.emacs.d/fireplace/fireplace") in your init file ('.emacs').
-Note that there is a significant performance difference bewteen the compiled and non-compiled fireplace.
+Note that there is a significant performance difference between the compiled and non-compiled fireplace.
+
 
 You can start the fire using ''M-x fireplace''.
 The fireplace will try to fill the current window with a new buffer.