create secondary scaffold
solve conflict while merging