conflict handling

conflict handling