Conflict Resolution

For the future board: