generated scaffold
solve conflicts