Unify file from upstream