changed a word
resolved conflict