add checks to avoid conflicts