Handle server-side conflicts (naively...)