Resolve conflicts
Delete assets
Delete assets
Delete stylesheets
resolve conflicts
Resolve conflicts
dev
Merge with master
Add application
Resolve teh conflicts