basic styles
lulz merge conflict
a little more descriptive