From 7a12885989be2f6ff4f5a86a7cbeb1a9c50b9a77 Mon Sep 17 00:00:00 2001
From: JDonadio <tanojaja@gmail.com>
Date: Mon, 20 Feb 2017 14:37:53 -0500
Subject: [PATCH] fix conflicts