Changelog Update

More collaborative behavior when encountering user edits in files.