Merge all changes from upstream