minor conflict handling