Finishing up on conflict