Add protien scaffold
Fixed merge