sexy styles
fixing merge conflict