Add doc for handling conflicts