Resolve path conflicts