auto-resolve. closes #26