improve conflict handling
