our solutions more content and styles
merge conflict