add doc about when merge conflicts are unavoidable