ResourceAssignment modified
conflict resolved