Style fixes
resolve conflicts.