style
merge conflict resolution
fixing style issues, not yet complete