changes some styles
resolves merge conflict