Basic styling
Merge conflict