Fixed config conflicts
Fixed config conflicts

rackerlabs/quark,jkoelker/quark,asadoughi/quark,insequent/quark,lmaycotte/quark,alanquillin/quark,blamarvt/quark,Cerberus98/quark,rackerlabs/quark,insequent/quark,asadoughi/quark,Cerberus98/quark,roaet/quark,lmaycotte/quark,roaet/quark,alanquillin/quark