Style modification
Conflicts fix