implementing minimal conflict handling