Resolved conflicts for 4 files and updated them to the last version of the startup class.
Added static file subfolders.