diff --git a/Makefile b/Makefile
index 1d7ad17..b86001a 100644
--- a/Makefile
+++ b/Makefile
@@ -2,7 +2,6 @@ VERSION ?= $(shell git describe)
 CPPFLAGS += -DVERSION=\"$(VERSION)\" -D_POSIX_C_SOURCE=199309L -DYA_INTERNAL -DYA_DYN_COL \
 			-DYA_ENV_VARS -DYA_INTERNAL_EWMH -DYA_ICON -DYA_NOWIN_COL -DYA_MUTEX -DYA_VAR_WIDTH \
 			-DYA_BSPWM
-<<<<<<< HEAD
 CFLAGS += -std=c99 -Iinclude -pedantic -Wall -flto -O2 `pkg-config --cflags pango pangocairo libconfig gdk-pixbuf-2.0 alsa`
 
 DEPS += pango pangocairo libconfig gdk-pixbuf-2.0 alsa
@@ -14,10 +13,6 @@ endif
 
 LDFLAGS += -flto -O2
 LDLIBS += -liw -lxcb -lpthread -lxcb-randr -lxcb-ewmh -lxcb-icccm -lxkbcommon -lxkbcommon-x11 -lxcb-xkb -lm `pkg-config --libs $(DEPS)`
-=======
-CFLAGS += -std=c99 -Iinclude -pedantic -Wall -Os `pkg-config --cflags pango pangocairo libconfig gdk-pixbuf-2.0 alsa`
-LDLIBS += -liw -lxcb -lpthread -lxcb-randr -lxcb-ewmh -lxcb-icccm -lm `pkg-config --libs pango pangocairo libconfig gdk-pixbuf-2.0 alsa`
->>>>>>> remove monospace, add to readme
 PROGRAM := yabar
 DOCS := $(PROGRAM).1
 PREFIX ?= /usr
diff --git a/doc/yabar.1.asciidoc b/doc/yabar.1.asciidoc
index e51172a..a4454f6 100644
--- a/doc/yabar.1.asciidoc
+++ b/doc/yabar.1.asciidoc
@@ -191,6 +191,11 @@ command-button4: "pactl set-sink-volume 0 +10%";
 command-button5: "pactl set-sink-volume 0 -10%";
 ----
 
+* *Pango fix*: When using some symbolic fonts, there can be occasional issues where space characters become unknown glyphs. This fix makes Pango use fallbacks properly (NOTE: the regular font should be specified first, then the symbolic font as shown in the Font section). Example:
+----
+fix-pango: true;
+----
+
 Yabar sets a handful of environment variables before executing your commands/scripts that are defined in the 'command-button{1-5}' entry. Such env variables can be useful when drawing your window on the corresponding button press or determining where the click occured. Current env variables are:
 ----
 $YABAR_BLOCK_X # beginning x axis for the block