Fixing formatting
Merging