styles and forms
resolve merge conflicts in styles, index, show