merged new local files