More visible files for deployment
Merged conflicts