Moving last patch file as resolved based on changes that will occur upstream