Final resolution of conflicts