Commit local changes before merge
Menual merge
Add basic content types needed for the project
Provide content type modules
Prepare styles for further processing
View scaffolding