merged a conflict in dcparser fields