ubuntu: edited file
conflict resolved while user:root added new file