diff --git a/README.md b/README.md
index 162adbd..dc81376 100644
--- a/README.md
+++ b/README.md
@@ -2,7 +2,12 @@
 GTK ui for neovim written in rust using gtk-rs bindings. 
 
 ## Font settings
+<<<<<<< HEAD
 To setup font add next line to *ginit.vim*
 ```
+=======
+To setup font call:
+```vim
+>>>>>>> ebade2ecf3c7b66d4bdbd7f833ad2a40de19e292
 call rpcnotify(1, 'Gui', 'Font', 'DejaVu Sans Mono 12')
 ```