edit some paths
restored conflict
restored another conflict