safety befor merge newLayout
merge with newLayout
edit .gitignore