merge: resolve conflicts in disputes.rs

- Keep remote version of disputes.rs which has full implementation
- Local version was just a stub

Author: user