remove zdag conflicts properly in removeConflicts
remove zdag conflicts properly in removeConflicts


Former-commit-id: 8a9c0055af0c9113e9769c06fe7b5a13bb1bd9e1
syscoin/syscoin,syscoin/syscoin,syscoin/syscoin,syscoin/syscoin,syscoin/syscoin,syscoin/syscoin,syscoin/syscoin,syscoin/syscoin