added conflict handling