Is it time for EJ and Stefan to settle their feud?