resolved merge deletions