update-config conflict resolved