style fixes
Resolve conflicts