Remove merge warnings