style fixes, some merging errors fixes
style fixes, some merging errors fixes