clean up conflict resolution doc