Comming soon page 1 step
merge conflicts