Conflict Prevents Updating

edit

I'm getting the following error when trying to update. Any ideas on how to resolve?

Total                                                                                                  1.7 MB/s |  60 MB     00:35     
Delta RPMs reduced 130.5 MB of updates to 59.7 MB (54.1% saved)
Running transaction check
Transaction check succeeded.
Running transaction test
The downloaded packages were saved in cache until the next successful transaction.
You can remove cached packages by executing 'dnf clean packages'.
Error: Transaction check error:
  file /usr/lib64/libGL.so.1 from install of mesa-libGL-13.0.3-5.fc25.x86_64 conflicts with file from package libglvnd-glx-1:0.2.999-7.gitdc16f8c.fc25.x86_64
  file /usr/lib64/libEGL.so.1.0.0 from install of mesa-libEGL-13.0.3-5.fc25.x86_64 conflicts with file from package libglvnd-egl-1:0.2.999-7.gitdc16f8c.fc25.x86_64
  file /usr/lib64/libGLESv2.so.2.0.0 from install of mesa-libGLES-13.0.3-5.fc25.x86_64 conflicts with file from package libglvnd-gles-1:0.2.999-7.gitdc16f8c.fc25.x86_64
  file /usr/lib/libGL.so.1 from install of mesa-libGL-13.0.3-5.fc25.i686 conflicts with file from package libglvnd-glx-1:0.2.999-7.gitdc16f8c.fc25.i686
  file /usr/lib/libEGL.so.1.0.0 from install of mesa-libEGL-13.0.3-5.fc25.i686 conflicts with file from package libglvnd-egl-1:0.2.999-7.gitdc16f8c.fc25.i686

Error Summary