fix merge conflict
fix merge conflict


Former-commit-id: b7ceb95bb49ea530d93d9a8537407146f5bbecc6
syscoin/syscoin,syscoin/syscoin,syscoin/syscoin,syscoin/syscoin,syscoin/syscoin,syscoin/syscoin,syscoin/syscoin,syscoin/syscoin