Resolved merge in db