is github still complaining about a merge conflict

Author: jrushlow

config/makers.xml

@@ -1,8 +1,5 @@
 <?xml version="1.0" ?>
 
-
-
-
 <container xmlns="http://symfony.com/schema/dic/services"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd">