resolve previously wrong resolved merge conflict