dir name changes
conflict resolved