conflict resolved
res conf