Update conflict code to handle empty_directories file.  Add code to allow metadata to produce changes.