word replaced
resolved merge conflict