Stylin' it up
Fix da conflicts