Handling conflict resolution