Updated add to check for conflicts