Changes in styles
Conflicts resolved