Things may have been smoothed over between you and a competitor, but it won’t last. You’ll be locking horns again in October.