= yaml = title: Conflict Resolution layout: syncbase theme: teal sort: 8 toc: true = yaml =