uploading PE25, after git sync conflicts