Resolve conflicts with UDP implementation