code style fixes
Conflict solved