Remove merge warning