mesa: Fix merge conflicts