new path changes
conflict resolved